git-svn-id: svn://172.16.4.16/Mgmt/branches/deal_proposal_merging@51552 5f7f8498-1dd9-4921-b02a-32c8b20ac2b9
git-svn-id: svn://172.16.4.16/Mgmt/branches/deal_proposal_merging@51758 5f7f8498-1dd9-4921-b02a-32c8b20ac2b9
git-svn-id: svn://172.16.4.16/Mgmt/branches/deal_proposal_merging@51759 5f7f8498-1dd9-4921-b02a-32c8b20ac2b9
git-svn-id: svn://172.16.4.16/Mgmt/branches/deal_proposal_merging@51760 5f7f8498-1dd9-4921-b02a-32c8b20ac2b9
git-svn-id: svn://172.16.4.16/Mgmt/branches/deal_proposal_merging@51769 5f7f8498-1dd9-4921-b02a-32c8b20ac2b9
merge trunk adserver changes

git-svn-id: svn://172.16.4.16/Mgmt/branches/deal_proposal_merging@52067 5f7f8498-1dd9-4921-b02a-32c8b20ac2b9
fixed conflict