Implements #646
Implements #647
Conflicts:
	src/main/java/com/jaeksoft/searchlib/ClientCatalog.java
Missing collection
Fix #646 #647
Merge pull request #650 from emmanuel-keller/1.6

Bug fix and enhancement