KFSQA-BA_fixes merging master into branch
[KFSQA-711] initial commit to test foreign vendor with newly added 'Remit' address.  Also do non resident calculation and GLPE check to include taxes withheld amount.
[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.
[KFSQA-711] merge from master
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'