Merge Andrew - fix bug 674381: global_status test failure Merge Monty - fix bug 669635: Boolean options in config file require a value while command line does not Merge Monty- fix bug #669707: Crash from boost::condition_variable assert fail when datadir is not full path