Backed out changeset 4c6024d6f725 (bug 830600) because of build failures
Backed out changeset d9bff5217809 (bug 830652) on the suspicion that it has broken Marionette
Bug 793239 - SettingsLock should have a state property to indicate if it is still valid. r=gwagner