Removed manually defined variables: these will be passed automatically.
Merge branch 'simplify-jenkins'

* simplify-jenkins:
  Removed manually defined variables: these will be passed automatically.