OOIION-1864: Fix deployment activation code - manual merge
Merge pull request #2098 from mmeisinger/fix1864_actdeploy

OOIION-1864: Fix deployment activation code - manual merge