[KFSQA-838] Preliminary work, merged so others can use it while I finish up the last couple of steps.
[KFSQA-838] Found a surprising issue during test run. Here is the hotfix so my commits should not break the build tonight. (fingers crossed)
[KFSQA-916] Merging changes from master for KFSQA-838 as these changes affect my test.
[KFSQA-916] Final code review changes.