Rename metadata to extraLayerInfo to avoid confusion

This PR replaces #1450 
Currently if they are missing (which is valid for WMS) they are `undefined` so the way I've done it matches the current behaviour more closely. So I'd be happier leaving it as I have it.