fix provider validation
use individual providers
clean datastore state
js_in_flight try/except
skip control on bz1142875
some lint fixes
Merge pull request #1188 from dajohnso/test_fixes

some Test fixes
test fixes round 2
Merge pull request #1190 from dajohnso/test_fixes_2

test fixes round 2
test fix 3
Merge pull request #1191 from dajohnso/test_fix_3

test fix 3