Merge branch 'ivr-multi-branch' into release-4.6-unstable-buildbot

Conflicts:
	sipXcommserverLib/src/sipdb/EntityDB.cpp
	sipXcommserverLib/src/test/sipdb/RegDBTest.cpp