FREEPBX-7117 - fixing implementation per discussion with the rest of the dev team
bumping version
Merge branch 'release/2.10' into release/2.11
bumping version