Bug 984528 - Touch CLOBBER file for rename of manifestdestiny -> manifestparser; a=clobber
Merge mozilla-central and fx-team