Update re-enrollment features to mirror auto-enrollment rule

Want to be able to create re-enrollment rules exactly as we create auto-enrollment rules with the ability to specify a specific auto-enrollment date.