make config names more consistent with each other
remove garbage - I don't know where it came from
Merge branch 'retries' into hboRepo