Auto deactivate for rollups following undeploy

Plus additional test coverage for RollupController