DATASOLR-55 - update documentation on collections with keywords
DATASOLR-55 - fix blocker pointed out by sonar

added additional tests to make sure the branch gets covered and
everything works.