Storage provision fix
Storage provision fix

Closes-Bug: #1533915
Closed-Bug: #1533998
Issue when provisioning storage+compute nodes, nova/cinder services
are not configured properly.
Fixed issue in unconfigure when removing the glace-api entry, used
the correct key.
Fixed keystone authentication setting username to cinderv2 incase of
openstack version > kilo.
Fixed issue in horizon in not displaying volumes in kilo.

Change-Id: Iec0bae8c33a3aa4b79ee84fc4d285130c6c434ce

Juniper/contrail-provisioning,Juniper/contrail-provisioning