Merge branch 'feature/BAZYNGO-716' into feature/Merge-K4-K5

Conflicts:
	cyklotron-core/src/main/java/net/cyklotron/cms/search/util/GenericIndex.java