Updated to latest from CloudBees with customizations.