KFSQA-BA_fixes merging master into branch
[KFSQA-784] Added the JSON merge script to the resources directory. Updated the test-factory and watir-webdriver gems to the most recent versions.
[KFSQA-784] Fixed the profiles a bit.
Merge remote-tracking branch 'origin/master' into KFSQA-784
[KFSQA-784] Forgot to update the MaintenanceObject.
Merging KFSQA-BA_fixes into master
KFSQA-791 clean up for merge with master
Merge branch 'KFSQA-791c'
[KFSQA-721] merge from master