Backed out changeset 229cd2ebe225 (bug 855108) for intermittent mochitest-bc failures
merge m-c to fx-team
Bug 715746 - Allow callback to be renamed and update to continue if in use. r=rstrong
Bug 715746 - Test fixes for allowing updates to be applied on Windows while the browser is open. r=rstrong

--HG--
rename : toolkit/mozapps/update/test/unit/test_0160_appInUse_xp_unix_complete.js => toolkit/mozapps/update/test/unit/test_0160_appInUse_complete.js
rename : toolkit/mozapps/update/test_svc/unit/test_0160_appInUse_xp_win_complete_svc.js => toolkit/mozapps/update/test_svc/unit/test_0160_appInUse_complete_svc.js
Merge m-c to inbound.