Update with new cqlmap.inc from garkier
more new indexes from Garkier
update test to match new index-mapping
Merge branch 'feature/1518-linkme_lid_og_lok' into develop