Merge from workbench_upgrade_rug_deploy_fix - Rugs no longer block installation of workbench upgrades