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

* commit 'c4c52bc646b7232f303859ee5950fa18c83a5a58':
  FREEPBX-7967 #QA #comment Proofread and fixed up some strings
tweaks and cleanup
Merge branch 'release/12.0' into develop