fixing test broken on previous commit
Merge branch 'develop' into ct-singleton-support2
Pull in fix for js-test-driver handling xml.bundle ->bundle.xml rename