Merge proposals dependent on lp://qastaging/~salgado/launchpad/separate-cookie-for-testopenid

1. separate-cookie-for-testopenid
2. Dependent merge proposals