Merge proposals dependent on lp://staging/~vila/ubuntu/precise/keystone/fix-922954

1. Precise (12.04)
2. fix-922954
3. Dependent merge proposals