Working locally and in Jenkins trapping failures. Tidied
Working locally and in Jenkins trapping failures. Tidied

Signed-off-by: John Howard <50ae662f5fcde39b7d1ed786133b7c61a25411dd@microsoft.com>

jhowardmsft/docker-w2wCIScripts