OOIION-1565 Refactor deployment activation logic

Reduce comlexity of deployment activator

@jamie-cyber1 please review
@mmeisinger please review
@kwilcox please review