FREEPBX-8061 - Fix issue with upgrading from 2.11 to 12 with NAT.
Merge branch 'develop' into release/12.0