FREEPBX-7129, FREEPBX-7229 along with a bug fix that essentially broke this module
Merge branch 'release/12.0' into develop

Conflicts:
	agi-bin/parkfetch.agi