added bz# on failing test, fixed failing test by excluding QA Org
Merge remote-tracking branch 'upstream/master'
Merge pull request #657 from hhovsepy/master

added bz# on failing test, fixed failing test by excluding QA Org