diff --git a/modules/jenkins/files/slave_scripts/maven-properties.sh b/modules/jenkins/files/slave_scripts/maven-properties.sh
old mode 100644
new mode 100755
index ca5328fd05..bf20bcac75
--- a/modules/jenkins/files/slave_scripts/maven-properties.sh
+++ b/modules/jenkins/files/slave_scripts/maven-properties.sh
@@ -6,11 +6,11 @@
 # versioned builds within the gerrit workflow.
 
 # get version info from scm
-SCM_TAG=$(git describe --abbrev=0 --tags) || true
-SCM_SHA=$(git rev-parse --short HEAD)
+SCM_TAG=`git describe --abbrev=0 --tags` || true
+SCM_SHA=`git rev-parse --short HEAD` || true
 
 # assumes format is like this  '0.0.4-2-g135721c'
-COMMITS_SINCE_TAG=`git describe | awk '{split($0,a,"-"); print a[2]}'`
+COMMITS_SINCE_TAG=`git describe | awk '{split($0,a,"-"); print a[2]}'` || true
 
 # just use git sha if there is no tag yet.
 if [[ "${SCM_TAG}" == "" ]]; then
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
index 85423c9e92..ad3f4f75e1 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/jenkins-plugin-jobs.yaml
@@ -3,13 +3,11 @@
     project-type: maven
     node: precise
 
-    properties:
-      - inject:
-          script-file: /usr/local/jenkins/slave_scripts/maven-properties.sh
-          properties-file: maven.properties
-
     prebuilders:
       - gerrit-git-prep
+      - shell: "/usr/local/jenkins/slave_scripts/maven-properties.sh"
+      - inject:
+          properties-file: maven.properties
 
     maven:
       maven-name: Maven3
@@ -27,13 +25,11 @@
     project-type: maven
     node: precise
 
-    properties:
-      - inject:
-          script-file: /usr/local/jenkins/slave_scripts/maven-properties.sh
-          properties-file: maven.properties
-
     prebuilders:
       - gerrit-git-prep
+      - shell: "/usr/local/jenkins/slave_scripts/maven-properties.sh"
+      - inject:
+          properties-file: maven.properties
 
     maven:
       maven-name: Maven3