Resync from fabric8