[MERGE-AFTER-PR-5366] Multi-container workspace Support#5110

Merged

sunix merged 2 commits intoeclipse-che:openshift-connector-rebasedfrom davidfestal:JBOSS-CHE-175

Jun 16, 2017

+75-40

Commits on Jun 15, 2017

Fix 2 NPE that prevented using *non-dev* additional machines
davidfestal
committed
Name openshift resources based on the machine name for non-dev machines
davidfestal
committed