Use #process so we do not need to alter form_alter running order

Alex Pottrequested to merge
issue/content_lock-3602061:3602061-split-hookformalter-up into 3.x

Closes #3602061

Merge request reports