[CXF-5153] Disabling servlet address updates by default on the trunk only

git-svn-id: https://svn.apache.org/repos/asf/cxf/trunk@1543091 13f79535-47bb-0310-9956-ffa450edef68
[CXF-5153] Actual servlet controller update

git-svn-id: https://svn.apache.org/repos/asf/cxf/trunk@1543092 13f79535-47bb-0310-9956-ffa450edef68