Swap out purely ENV based feature flags for rollout

Implement rollout with features currently enabled by an ENV variable so
we may take advantage of some of rollouts more robust features going
forward.