Improved self-test for MarkLogic 7
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	deploy/test/data/ml7-config.xml
	deploy/test/test_server_config.rb
Fix for #210: new usage when running ml from roxy root
Fix for #176: improved Roxy documentation
Removed usage as explicit command
Removed usage as explicit command
Fix for #207: used eval instead of xdmp:user to get scheduled user
Initial attempt on #8: capturing the full environment ml-config with capture --full-ml-config
Added JSON Parsing on response bodies for ML 7
Extended ml7-config.xml self-test data with non-default values, schemas, module-locations, and request-blackouts
Fixes for #209, #211, #212: enabled appserver settings validation, and added functionality to set schemas, module-locations, and request-blockouts on appservers
Fix for #214: allowing --server-version param for self-test
Extra log line showing test version
Added mimetype sample to ml-config sample
Added version check to module-locations (#209), removed server setting definition redundancy
Fix for #216 and #217: exit early at ml new failure, and --fork option for ml new
Added --fork to upgrade as well (#217)
Merge remote-tracking branch 'upstream/dev' into dev
Removed roxy dir check from ml, improved ml help a bit
Improved ml self-test param handling (#214)