Bug 828633 - Disable perma-orange test, a=test-only
Merge m-c to s-c.
Bug 811490 - Follow-up: convert services/sync/tests/tps/test_privbrw_tabs.js to PB per window mode. r=trivial