Bug 908602 - Remove Facebook partner key from v1-train repository
Bug 897283 - No scroll in input PUK screen
Merge pull request #11974 from alivedise/bugzilla/897283_v1-train

Bug 897283 - No scroll in input PUK screen, r=alive, a=leo+
Merge pull request #11712 from timdream/v1-train

Bug 908602 - Remove Facebook partner key from v1-train repository, r=jmcf
Merge branch 'v1-train' into v1.1.0hd