Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

# Conflicts:
#	atms-api/pom.xml

atms-api/pom.xml

@@ -432,9 +432,6 @@
     <profiles>
         <profile>
             <id>dev</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
             <build>
                 <filters>
                     <filter>src/main/resources/conf/conf_profile_dev.properties</filter>
@@ -477,6 +474,7 @@
                 <env>uat</env>
             </properties>
         </profile>
+
     </profiles>
 
     <build>