15.1.1-7 Conflicts (these files were moved to AWIPS2_baseline): rpms/awips2.core/Installer.java/build.sh rpms/awips2.core/Installer.java/common/scripts/profile.d/awips2Java.sh Former-commit-id: df806c9479cb29a5f47f1511ad70e140b2bbf8ec