Merge pull request #1014 from kalxas/master

give more time to GeoServer to start-up (#938)
Moved gisdata to Recommends, refs #1015
Merge branch 'master' of github.com:GeoNode/geonode