Geoserver-ext packaging changes

Somehow GitHub seems to have corrupted https://github.com/GeoNode/geonode/pull/599 which had 2 of these 3 commits in it. Not sure how/why it happened.

This will ensure that the geoserver data.zip ends up in the right place on the server for pavement to find it at setup.