fixes from review

replace new Date().getTime() with System.currentTimeMillis()
Merge branch 'retries' into hboRepo