compilation error building Openshift Tools in master against Docker Tools 3.0 from Oxygen.0.M7

   [p2.dir] !MESSAGE Cannot complete the install because one or more required items could not be found.
   [p2.dir] !MESSAGE Software being installed: JBoss OpenShift 3 Tools Developer Resources 3.4.0.v20170519-1022 (org.jboss.tools.openshift.feature.source.feature.group 3.4.0.v20170519-1022)
   [p2.dir] !MESSAGE Missing requirement: OpenShift 3 UI 3.4.0.v20170510-2205 (org.jboss.tools.openshift.ui 3.4.0.v20170510-2205) requires 'bundle org.eclipse.linuxtools.docker.core [2.1.0,3.0.0)' but it could not be found
   [p2.dir] !MESSAGE From: JBoss OpenShift 3 Tools 3.4.0.v20170519-1022 (org.jboss.tools.openshift.feature.feature.group 3.4.0.v20170519-1022)

[ERROR] Failed to execute goal org.eclipse.tycho:tycho-compiler-plugin:1.0.0:compile (default-compile) on project org.jboss.tools.openshift.ui: Compilation failure: Compilation failure:
[ERROR] /home/nboldt/eclipse/workspace-jboss/jbosstools-github-master/jbosstools-openshift/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/deployimage/DeployImageWizardModel.java:[30]
[ERROR] import org.eclipse.linuxtools.docker.core.IDockerConnectionManagerListener2;
[ERROR] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[ERROR] The import org.eclipse.linuxtools.docker.core.IDockerConnectionManagerListener2 cannot be resolved
[ERROR] /home/nboldt/eclipse/workspace-jboss/jbosstools-github-master/jbosstools-openshift/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/deployimage/DeployImageWizardModel.java:[58]
[ERROR] implements IDeployImageParameters, IDockerConnectionManagerListener2, PropertyChangeListener {
[ERROR] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[ERROR] IDockerConnectionManagerListener2 cannot be resolved to a type
[ERROR] /home/nboldt/eclipse/workspace-jboss/jbosstools-github-master/jbosstools-openshift/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/deployimage/DeployImageWizardModel.java:[97]
[ERROR] DockerConnectionManager.getInstance().addConnectionManagerListener(this);
[ERROR] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[ERROR] The method addConnectionManagerListener(IDockerConnectionManagerListener) in the type DockerConnectionManager is not applicable for the arguments (DeployImageWizardModel)
[ERROR] /home/nboldt/eclipse/workspace-jboss/jbosstools-github-master/jbosstools-openshift/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/deployimage/DeployImageWizardModel.java:[103]
[ERROR] DockerConnectionManager.getInstance().removeConnectionManagerListener(this);
[ERROR] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[ERROR] The method removeConnectionManagerListener(IDockerConnectionManagerListener) in the type DockerConnectionManager is not applicable for the arguments (DeployImageWizardModel)
[ERROR] /home/nboldt/eclipse/workspace-jboss/jbosstools-github-master/jbosstools-openshift/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/deployimage/DeployImageWizardModel.java:[667]
[ERROR] public void changeEvent(int event) {
[ERROR] ^^^^^^^^^^^^^^^^^^^^^^
[ERROR] The method changeEvent(int) of type DeployImageWizardModel must override or implement a supertype method
[ERROR] /home/nboldt/eclipse/workspace-jboss/jbosstools-github-master/jbosstools-openshift/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/deployimage/DeployImageWizardModel.java:[670]
[ERROR] public void changeEvent(IDockerConnection connection, int event) {
[ERROR] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[ERROR] The method changeEvent(IDockerConnection, int) of type DeployImageWizardModel must override or implement a supertype method
[ERROR] /home/nboldt/eclipse/workspace-jboss/jbosstools-github-master/jbosstools-openshift/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/deployimage/DeployImageWizardModel.java:[671]
[ERROR] if ((event == ADD_EVENT)
[ERROR] ^^^^^^^^^
[ERROR] ADD_EVENT cannot be resolved to a variable
[ERROR] /home/nboldt/eclipse/workspace-jboss/jbosstools-github-master/jbosstools-openshift/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/deployimage/DeployImageWizardModel.java:[672]
[ERROR] || (event == REMOVE_EVENT)) {
[ERROR] ^^^^^^^^^^^^
[ERROR] REMOVE_EVENT cannot be resolved to a variable
[ERROR] /home/nboldt/eclipse/workspace-jboss/jbosstools-github-master/jbosstools-openshift/plugins/org.jboss.tools.openshift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/fromimage/ApplicationSourceFromImageModel.java:[55]
[ERROR] public class ApplicationSourceFromImageModel
[ERROR] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[ERROR] The hierarchy of the type ApplicationSourceFromImageModel is inconsistent
[ERROR] 9 problems (9 errors)