Merge "Include site header, footer and CSS on OpenID login form" into stable-2.6