pull changes from master to jenkins on 2014-11-23

This pull brings in the following approved pulls to the jenkins branch:
* #1427: make phpunit 4.3.5 available as `/etc/php5/deploy-includes/phpunit.phar`

as well as many changes which should not be relevant to jenkins configuration or operation.

Once this pull is merged, i will load changes on jenkins.buttonweavers.com as part of #1377.