FREEPBX-7967 Merge branch 'release/2.11' into develop
Merge pull request #1 in FREEPBX/userman from ~COVERUP0204/userman:release/2.11 to release/2.11

* commit 'ea6fe8b682c3f12882d2016fab5fab8791b297ca':
  FREEPBX-7967 #QA #comment Proofread and fixed up some strings
Merge pull request #4 in FREEPBX/userman from ~COVERUP0204/userman:develop to develop

* commit '4e2422712f5c9d9369d13ecf1578770fce5fa384':
  FREEPBX-7967 #QA #comment Proofread and fixed up some strings
Merge branch 'release/12.0' into develop
Merge branch 'release/12.0' into develop
Merge branch 'master' into release/2.11
Merge branch 'release/2.11' into develop