Merged revision(s) 1588083 from lucene/dev/branches/branch_4x:
Merged revision(s) 1588082 from lucene/dev/trunk:
LUCENE-5540: Update forbidden-apis to 1.5

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1588086 13f79535-47bb-0310-9956-ffa450edef68
Fix typo in CHANGES.txt

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1588168 13f79535-47bb-0310-9956-ffa450edef68
Merged revision(s) 1588379 from lucene/dev/branches/branch_4x:
Merged revision(s) 1588378 from lucene/dev/trunk:
Update to bugfix release of forbidden-apis to work around annotations bug (may affect lucene in the future)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene_solr_4_7@1588383 13f79535-47bb-0310-9956-ffa450edef68