[openstack-keystone/el6] (5 commits) ...Merge branch 'master' into el6

[Alan Pevec]

Summary of changes:

  44f4456... change default catalog backend to sql (*)
  7aebc9c... essex rc1 snapshot (*)
  3d84fc6... critical fix for catalog sql backend (*)
  a52820c... upate to final essex rc1 (*)
  747f965... Merge branch 'master' into el6

(*) This commit already existed in another branch; no separate mail sent