Dev gabriel PR for issue #334

Fix to https://gitlab.gridpane.net/gp-public/server-scripts/issues/334

Replaced condition in gpclone.sh and gprestore.sh in addition to gp.sh