PT48083963 - Calls hold/pickup fails in a HA setup with two servers and shared lines

Two changes were done in proxy's NAT traversal plugin:
- Use a modified Contact header (the header was modified to contain endpoint's public
and private address) for all message types except for SUBSCRIBE and NOTIFIES. Previously,
the header was restored for all messages except INVITES in order to fix some presence
issues. Because of this approach a proxy was unable to route correctly other requests
such as PRACK or ACK.
- Do not let a proxy change the request URI of a request if it is not the "last" proxy
to route that request to the endpoint behind NAT. If a proxy changes the request URI
the next proxy will not be able to route it correctly.
Removed a debug log message from proxy. Lowered the level of another log message from SAA.
PT-48671343 - display error message when options are invalid
PT-48382953 - generate profiles for autoprovisoned phones
PT-49113667 - In Polycom 4.0+ profiles check some settings by phone feature. This would prevent unnec. warnings to litter config log
PT-48556315 - added default firmware version for a new phone model.
PT-336655 Multiple zones in a cluster
XX-9767

User's CDRs, voicemail timestamps (including IVR prompts), schedules follow user's timezone.
Timezone can be set at:
branch level
group level
user level

Both admins and users may change a user's timezone.
PT-41478423: Provide ability to block updating voicemail PIN during LDAP sync

-add global setting in Ldap/AD page. By default PIN gets overwritten upon every LDAP import (checked checkbox)
if unchecked PIN will not get overwritten - it gets saved at user creation and remains unchanged during LDAP imports
-this setting is saved in setting_value table and applies for all configured LDAP connections.
The setting path is: ldap/overwrite_pin

Conflicts:

	sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/bulk/ldap/LdapManager.java
	sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/bulk/ldap/LdapManagerImpl.java
	sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/bulk/ldap/LdapRowInserter.java
	sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/bulk/ldap/ldap.beans.xml
PT-46296919 make polycom default version configurable
Merge branch 'PT-41478423-FINAL' into release-4.6
PT-49296787 - changed default value for everyone phonebook to disabled. In large installations, enabling everyone phonbook would result in a large MAC-directory.xml and some Polycom models would not be able to load it and to display speed dials.
PT-46425935 - changed missed call tracking to enabled by default. Disabling it will make Polycoms not display missed calls.
PT-48938705 - delete conferences owned by a user when the user gets deleted.
fix precommit
PT47930541: Audiocodes 4xxHD Support
Merge branch 'release-4.6' of github.com:dhubler/sipxecs into release-4.6
PT-49088557 - have sipxconfig generate aliases when VM and AA role is enabled. This ensures vm alias permission is in replicated in mongo.
Revert "PT-49088557 - have sipxconfig generate aliases when VM and AA role is enabled. This ensures vm alias permission is in replicated in mongo."

This reverts commit 9dffb768fefbc453e5337c0e572680a605efdb01.

Reason: code should be in post commit not in replicate!!
PT-49088557 -have sipxconfig generate aliases when VM and AA role is enabled. This ensures vm alias permission is in replicated in mongo.
Merge branch 'SAA_proxy_fix' into release-4.6