Preparing for merge with unversioned angular UI screens. Fixing POMs