build err - sipxconfig plugins were not part of build
Revert "Revert "Squashed commit of the following:""

This reverts commit 3125d99b3464b60768bc31b612f55b861c3ba23e.
PT 48245165: "On the phone" is not displayed when call initiated from Unite client

-should not handle dialog-events when caller equals with callee
PT-48728509 - Fix sipxconfig_archive.rb script
Merge branch 'PT46608005' into release-4.6
PT-45056929 - change acess level 'saveExtentionWithWorkaroundIfInUse' method from default to protected
Merge branch 'PT-45056929-sf' into release-4.6-unstable

Conflicts:
	sipXpolycom/src/org/sipfoundry/sipxconfig/phone/polycom/PolycomUpload.java