fix Image layer; fix XYZ layer
Merge pull request #3354 from bolhovsky/fix/openlayers

Extend Image layer definition + small fixes