Merge "Bug 1139 Modify cors-config according to request"