test(rootScope): reorganize $watch deregistration specs into a describe
fix(Scope): don't let watch deregistration mess up the dirty-checking digest loop

Closes #5525
Merge branch 'master' of https://github.com/angular/angular.js