Merge "Always create an EnforcingAdmin with a non-null ActiveAdmin." into udc-dev