more config replacements, including FO [KFSQA-832]
more config replacements, including FO [KFSQA-832]
adding todos for areas of concern [KFSQA-832]
adding exceptions and checking [KFSQA-832]
adding exceptions and checking [KFSQA-832]
minor fixes [KFSQA-832]
Merge branch 'master' into services_work
more config replacements [KFSQA-832]
Merge branch 'master' into services_work

Conflicts:
	lib/kuality-kfs/global_config.rb
	lib/resources/parameters.xml
more config replacements [KFSQA-832]
Merge branch 'master' into services_work

Conflicts:
	lib/resources/parameters.xml
final edits before review [KFSQA-832]
Merge branch 'master' into services_work

Conflicts:
	lib/kuality-kfs/global_config.rb
	lib/resources/parameters.xml
[KFSQA-839] Psuedo-merge for kuality-kfs.
removed dup from parm file
[KFSQA-839] Psuedo-merge for kuality-kfs.
Merge remote-tracking branch 'origin/master' into KFSQA-839

Conflicts:
	lib/kuality-kfs.rb
	lib/kuality-kfs/data_objects/vendor/vendor_object.rb
	lib/resources/parameters.xml