Merge "Fixes starting app in docked stack for cts tests" into oc-dev