add qa step
merge master
changes from code review.
Merge branch 'master' into js-add-qa
refactoring code to correctly log errors.
removing cancelled status
fixes tests
Merge pull request #438 from nla/js-add-qa

Js add qa
Merge remote-tracking branch 'origin/master' into dsc-123