Tweaks for final integration with Capistrano 3.3.3wq