double commit for Ifbd27c120fdae08629864a352d5db5d5c64314ff: To add support for heat in openstack-db command to enable for icehouse and juno ubuntu

Change-Id: I407aeae65cd172639fcc117c94f8b4ba39d090a2
Merge "double commit for Ifbd27c120fdae08629864a352d5db5d5c64314ff: To add support for heat in openstack-db command to enable for icehouse and juno ubuntu"