Merge branch 'develop'

CHANGES

man/cobalt.conf.5

src/clients/POSIX/qstat.py

src/clients/cqadm.py

src/clients/cqstat.py

src/lib/Components/BGQBooter.py

src/lib/Components/bgq_base_system.py

src/lib/Components/bgqsystem.py

src/lib/Components/cqm.py

src/lib/Util.py

src/lib/client_utils.py

testsuite/TestCobalt/TestComponents/test_cqm.py

testsuite/TestCobaltClients/test_data/cqadm_args.py

testsuite/TestCobaltClients/test_data/qstat_args.py

testsuite/TestCobaltClients/test_files/cqadm_test.py

testsuite/TestCobaltClients/test_files/qstat_test.py

testsuite/TestCobaltClients/testlib/Proxy.py

tools/mk_jobs.py

tools/mk_queues.py