make sure heat-engine heat-api are started by supervisord only

Change-Id: I7b3c9f75128e4f667781adda3f88e2c702694b74
Merge "make sure heat-engine heat-api are started by supervisord only" into R2.0