refactor to latest fabric8-utils refactor