trunk tracking upto r3895

Note that I did not attempt to incorprorate the new pagespeed_admin  handler from r3891, since I am unclear about Jeff's plan for it.

master merge is included as per instructions, Jeff's 61025c5 is from it.

7679326 may require extra attention since it's a completely new bugfix and not straightforward merge stuff.