Fix getting cinder devices in heat

Fixes bug: #1261346

Change-Id: I1fd5ab1fa5b2ce04e64ac757f415bc0686153fb3
Added heat service retrieving from keystone catalog

Change-Id: Icfc2136c3db3c23e04984e5aef05d1e84bec8a40
Closes-Bug: #1260703
Merge "Added heat service retrieving from keystone catalog"
Merge "Fix getting cinder devices in heat"