Merge "Add provide-maven-settings prebuilder to all templates"

diff --cc jjb-templates/clm.yaml
Simple merge

diff --cc jjb-templates/daily.yaml
Simple merge

diff --cc jjb-templates/distribution.yaml
Simple merge

diff --cc jjb-templates/integration.yaml
Simple merge

diff --cc jjb-templates/merge.yaml
Simple merge

diff --cc jjb-templates/sonar.yaml
Simple merge

diff --cc jjb-templates/verify.yaml
Simple merge