Bug 962041 - Fix component apha with the new ContentClient/Host. r=mattwoodrow