Bug 1103216: update Google parameters, r=gavin, f=mfinkle, a=gavin

--HG--
extra : rebase_source : 6923a695731266ba8d19581b025f39b7dd62f85d
Bug 1103216: update tests to deal with Google parameter changes, r=felipe, a=gavin

--HG--
extra : rebase_source : 48557489bdeaa39a633f70ea08d9d1e614c98302
Bug 1104114: update copy for HPOPA, r=gavin, a=lmandel

--HG--
extra : rebase_source : db26cd36247fef512d94662fd7d0ca3404758c93