FREEPBX-7097 fixed User with no rights can reload asterisk system by clicking reload bar button
Fixed merge conflicts
Merge branch 'release/2.11' into release/12.0