Reduce comlexity of deployment activator
Merge pull request #2022 from MauriceManning/deploy2_rebase

OOIION-1565 Refactor deployment activation logic