SOLR-1301: Straighten out module names so that they match current convention

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1547819 13f79535-47bb-0310-9956-ffa450edef68
SOLR-5502: Moving change log entry to the other section because this bug hasn't been released yet

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