Merge branch '4.9' into 4.10

Author: yadvr

.travis.yml

@@ -149,9 +149,9 @@ env:
 #    - TESTS="component/test_accounts"
 #    - TESTS="component/test_organization_states"
 
-before_install: travis_wait 30 ./tools/travis/before_install.sh
+before_install: travis_wait 60 ./tools/travis/before_install.sh
 install: ./tools/travis/install.sh
-before_script: travis_wait 30 ./tools/travis/before_script.sh
+before_script: travis_wait 60 ./tools/travis/before_script.sh
 script:
   - travis_wait 40 ./tools/travis/script.sh ${TESTS}
 after_success: ./tools/travis/after_success.sh

agent/conf/cloudstack-agent.logrotate agent/conf/cloudstack-agent.logrotate.inagent/conf/cloudstack-agent.logrotate renamed to agent/conf/cloudstack-agent.logrotate.in

@@ -93,12 +93,6 @@
                     </filterreader>
                   </filterchain>
                 </copy>
-                <copy
-                  todir="${basedir}/target/transformed">
-                  <fileset dir="${basedir}/conf">
-                    <include name="cloudstack-agent.logrotate" />
-                  </fileset>
-                </copy>
               </target>
             </configuration>
           </execution>