fixed up some of the hard coded items again [KFSQA-1060]
Merge remote-tracking branch 'origin/master'