Merge changes from topic 'fix-monit-script'
authorAric Gardner <agardner@linuxfoundation.org>
Tue, 29 Nov 2016 12:31:13 +0000 (12:31 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 29 Nov 2016 12:31:13 +0000 (12:31 +0000)
* changes:
  utils: jenkins-jnlp-connect.sh: Make monit actions conditional
  utils: jenkins-jnlp-connect.sh: Fix start up script


Trivial merge