tests were running too slowly causing it to try to run while it was still running [KFSQA-1050]
Merge remote-tracking branch 'origin/master'