No bug - cleanup of personal configs only. r=stamp
Merge remote-tracking branch 'origin/master' into vcs_multi_repo