Enhanced verification of heat service availability.
Merge remote-tracking branch 'origin/heat_tests' into heat_tests
setup.py merged.