FREEPBX-6471 #QA #comment fixed in 2.11.1.2, depends on framework as well
Fixes merge conflicts