Add hidden fields back to access control forms
Merge branch 'bugfix/avalon-3018' into develop
Merge branch 'develop' of https://github.com/avalonmediasystem/avalon into develop