Tune XPath expression to get WMS layer names and titles
Merge branch 'feature/CDB-514' into import-dialog

* feature/CDB-514:
  Tune XPath expression to get WMS layer names and titles
WIP