Re-enable CORS support

See: https://jira.springsource.org/browse/XD-730?focusedCommentId=92959&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-92959