bug 753022: debug builds should have marionette enabled and tested. r=bhearsum,ted
Bug 760577 - Part 1: Keep the update files around when an update has been staged; r=rstrong
Bug 760577 - Part 2: Fall back to regular updates if the replacing step fails after we've staged an update; r=rstrong
Bug 760577 - Part 3: Verify the fallback behavior on all the locked file tests; r=rstrong

--HG--
rename : toolkit/mozapps/update/test/unit/test_0161_appInUse_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0162_appInUse_xp_win_complete.js
rename : toolkit/mozapps/update/test/unit/test_0172_fileLocked_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0174_fileLocked_xp_win_complete.js
rename : toolkit/mozapps/update/test/unit/test_0173_fileLocked_xp_win_partial.js => toolkit/mozapps/update/test/unit/test_0175_fileLocked_xp_win_partial.js
rename : toolkit/mozapps/update/test/unit/test_0184_fileInUse_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0188_fileInUse_xp_win_complete.js
rename : toolkit/mozapps/update/test/unit/test_0185_fileInUse_xp_win_partial.js => toolkit/mozapps/update/test/unit/test_0189_fileInUse_xp_win_partial.js
rename : toolkit/mozapps/update/test/unit/test_0186_rmrfdirFileInUse_xp_win_complete.js => toolkit/mozapps/update/test/unit/test_0190_rmrfdirFileInUse_xp_win_complete.js
rename : toolkit/mozapps/update/test/unit/test_0187_rmrfdirFileInUse_xp_win_partial.js => toolkit/mozapps/update/test/unit/test_0191_rmrfdirFileInUse_xp_win_partial.js
rename : toolkit/mozapps/update/test_svc/unit/test_0161_appInUse_xp_win_complete_svc.js => toolkit/mozapps/update/test_svc/unit/test_0162_appInUse_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0172_fileLocked_xp_win_complete_svc.js => toolkit/mozapps/update/test_svc/unit/test_0174_fileLocked_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0173_fileLocked_xp_win_partial_svc.js => toolkit/mozapps/update/test_svc/unit/test_0175_fileLocked_xp_win_partial_svc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0184_fileInUse_xp_win_complete_svc.js => toolkit/mozapps/update/test_svc/unit/test_0188_fileInUse_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0185_fileInUse_xp_win_partial_svc.js => toolkit/mozapps/update/test_svc/unit/test_0189_fileInUse_xp_win_partial_svc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0186_rmrfdirFileInUse_xp_win_complete_svc.js => toolkit/mozapps/update/test_svc/unit/test_0190_rmrfdirFileInUse_xp_win_complete_svc.js
rename : toolkit/mozapps/update/test_svc/unit/test_0187_rmrfdirFileInUse_xp_win_partial_svc.js => toolkit/mozapps/update/test_svc/unit/test_0191_rmrfdirFileInUse_xp_win_partial_svc.js
Bug 760577 - Part 4: Add full round-trip tests for keeping the mar file around and falling back to apply it at startup if replacing the application fails; r=rstrong

--HG--
rename : toolkit/mozapps/update/test/unit/test_0201_app_launch_apply_update.js => toolkit/mozapps/update/test/unit/test_0203_app_launch_apply_update.js
rename : toolkit/mozapps/update/test_svc/unit/test_0201_app_launch_apply_update_svc.js => toolkit/mozapps/update/test_svc/unit/test_0203_app_launch_apply_update_svc.js
Bug 764269 - Handle symbolic links properly when copying the installation directory before staging an update; r=rstrong
Bug 764587 - Do not throttle the download of a complete mar if we fall back to a complete update after attempting to stage a partial update; r=rstrong
Bug 757632 - Re-enable the test; r=rstrong
Backout 4d93e6ed8a49 (bug 764774) for mochitest-chrome failure in test_bug675492.xul
Merge mozilla-central into mozilla-inbound