Merge branch 'develop' into feature/dynamic-cluster

Author: alai8

wercker.yml

@@ -32,8 +32,8 @@ build:
   - script:
     name: Install pre-reqs
     code: |
-      yum -y install tar gzip
-  - java/maven:
+      yum -y install tar gzip procps
+  - wercker/maven:
     goals: clean install
     version: 3.5.2
     cache_repo: true
@@ -216,8 +216,8 @@ quality:
   - script:
     name: Install pre-reqs
     code: |
-      yum -y install tar gzip
-  - java/maven: 
+      yum -y install tar gzip procps
+  - wercker/maven: 
     profiles: build-sonar 
     maven_opts: -Dsonar.login=${SONAR_LOGIN} -Dsonar.password=${SONAR_PASSWORD} -Dsonar.host.url=${SONAR_HOST} 
     goals: clean install sonar:sonar