prevent invalid state transition
from 'dormant' to 'active' w/o registration

This was very hard to trigger, but nevertheless possible.
Merge bug25640
stable to default