Bug 1030227 - FxA must fire onlogin() for RPs that have called watch(). r=jedp
Bug 1028044 - Use auth instead of autheap in phase2 settings. r=vchang