SHDP-171 Saving work with first working unit test
SHDP-171 tidy up
SHDP-171 Modify ContainerLauncherInterceptor

Adding Container into interceptor because previously it
was part of the ContainerLaunchContext. That's not a case
anymore and we need this info.