Add retry on HapiTimeout

Also, I can't help myself from fixing lint warnings