Updated the other methods which retry in a loop to use the same logic
Re-organized imports against check style
Added commons bundle to poms
Fixed check style issues