Fixed a NullPointerException that caused no tasks to be launched
Fixed NullPointerException further down
Merge branch 'feature/containers' into cdh5-containers