Upgrades, increase timeout for database restore

When upgrade system migrates database from
one container to another, sometimes there is
timeout error on psql restore command.
Increased with retries to give 2 minutes
timeout for puppet to pass.

Change-Id: I354d7bae9bef2cba49594f846d5e7d2773072156
Closes-bug: #1341492
Merge "Upgrades, increase timeout for database restore"