Preparing ThresholdsMC metric for SSB
update and corrections to all pledges and thresholds - 62% complete
Merge branch 'master' into test-john

Conflicts:
	WFM_Input_DashBoard/WFMonDBShort.py
corrected conflict with WFMonDBShort.py
Merge branch 'master' into test-john
Merge branch 'master' into test-john
merge branch 'master'
Merge branch 'master' into test-john
Revert c06b62d..09eca76

This rolls back to commit c06b62d40c9abd1ee192e86fc662836d28b8b7a5.
Revert "Revert c06b62d..09eca76"

This reverts commit b53184e13d30fc012887419967bbd0a3c7ef3462.
Revert 5b2d0dd..46018fd

This rolls back to commit 5b2d0ddd470f96b2f083d1d6e54acb49b4916874.
Revert "Revert 5b2d0dd..46018fd"

This reverts commit 83772b91d6b25e0c38def5560b3a2dc7df238042.
Revert "merge branch 'master'"

This reverts commit 5b2d0ddd470f96b2f083d1d6e54acb49b4916874.
Revert "Merge branch 'master' into test-john"

This reverts commit c06b62d40c9abd1ee192e86fc662836d28b8b7a5, reversing
changes made to 9c1c02e33693647408f79ed72777477f698c4b35.
problem with merging branches solved

merged branch “master” into “test-john”
master branch merged at commit:
c1bf6206d5f8cc68ef2d81a0fc3629a0ab333b17
Merge branch 'master' into test-john
Merge pull request #43 from CMSCompOps/test-john

Test john