ERROR_WAIT_TIME should be a config option

As discussed at https://review.openstack.org/#/c/112941/
replace the hard-coded timeout value with a config option.

Change-Id: I49ddf254dfe6460626d90cc75f89e798227dfff6
Closes-Bug: #1385014
Merge "ERROR_WAIT_TIME should be a config option"