Bug 974622 - Configure holly like Aurora properly. r=sfink