Move notofications for glance and cinder to correct place
(outside of use_ldap if)
Merge branch 'fix-bugs' into msdd448-current