Upgrade to Jenkins 1.587