Closes-Bug:1313755 adding code to remove heat conf files

Change-Id: Iefe1a34b09958d21d2516fdce0937e00e32afcb5
Merge "Closes-Bug:1313755 adding code to remove heat conf files"
Merge branch 'master' of https://github.com/openstack-dev/devstack