fixes #1584 along with a related change in fabric8. Might address #1545 but needs testing to be sure that things now work fine in docker