SHDP-171 Fixing some tests for changes in CONTAINER_ID env variable

AM_CONTAINER_ID is now CONTAINER_ID. Changes for this and tests
which failed.
SHDP-171 Remove user and tidy up

Remove user from yarn client because api doesn't use it anymore.
Tidying up classes.