Merge branch 'trunk' into openstack-identity-fix