when sorting data overlays keep general overlays first

Merged Piotr Gawron requested to merge 1895-order-of-data-overlays into devel_16.2.x

Merge request reports