Merge Vijay - fix bug 585982 - Default datadir and pid-file location reported by --help were incorrect Merge Monty - fix bug 648360 - Fix a few small things in the sphinx doc build. Adds some initial docs for program options loading. Merge Lee - fix bug 621304 - Fix filesystem_engine.multiple_update test failure on OSX