allow sub-admin not to change the category (refs #3670, BP from #3072)
fix a regression caused by the CommunityForm changes (refs #3670, BP from #3072)
Merge remote-tracking branch 'ama/t-3670' into stable-3.6.x