Merge branch 'master' of https://github.com/dmwm/WMCore into reqmgr2_get_post_test_clean_merge

Conflicts:
	src/couchapps/ReqMgr/views/childresubmissionrequests/map.js