FREEPBX-7263 #close Give users the ability to change KEEPCID value
Merge branch 'release/2.11' into develop

Conflicts:
	functions.inc.php
FREEPBX-7263 Bumping module.xml version