SHDP-163 Better handling of containers

Changing various places for appmaster and monitoring
for things to align better on different scenarios.
tidy up