#237 Refactored re-try on REST timeouts, ahve a bit of untested code waiting for greater frequency of 500 errors so we can cope with those too.