Merge "Fixes cinder keystone auth"