Replace download.ws properties with merged download.ws
Merge branch 'master' of https://github.com/gbif/portal-web
update appdev profile for merged download-ws