Add merged annotation support to @CrossOrigin#877

nithril wants to merge 1 commit intospring-projects:masterspring-projects/spring-framework:masterfrom

nithril:SPR-13468Copy head branch name to clipboard