Bug 949600 - Sync mozbase to m-c one last time, r=wlach
Bug 949600 - Update CLOBBER to test mozfile changes which previously broke it