Merge "No clean before deploy"

diff --combined jjb/global-templates-java.yaml
index 7b8ee57,8d0a0d4..a47ff00
--- 1/jjb/global-templates-java.yaml
--- 2/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@@ -960,7 -960,6 +960,7 @@@
      #                     parameterized.
      name: '{project-name}-{stream}-stage-site-java'
      project-type: freestyle
 +    node: '{build-node}'
  
      properties:
        - ecomp-infra-properties:
@@@ -996,16 -995,7 +996,7 @@@
        - maven-target:
            maven-version: '{maven-version}'
            pom: '{site-pom}'
-           goals: 'clean site:site'
-           settings: '{mvn-settings}'
-           settings-type: cfp
-           global-settings: 'global-settings'
-           global-settings-type: cfp
- 
-       - maven-target:
-           maven-version: '{maven-version}'
-           pom: '{site-pom}'
-           goals: 'clean site:stage-deploy'
+           goals: 'clean site:site site:stage-deploy'
            settings: '{mvn-settings}'
            settings-type: cfp
            global-settings: 'global-settings'