Merge branch 'dev' of https://git.eclipse.org/r/osee/org.eclipse.osee into java11 Change-Id: Ia331ad598b92f2d20ace6b290d3f0098fa208fb5