bug 894885 - move common mozconfig options to the common mozconfig, follow up to move some things back r=glandium