Minor fixes
A series of minor fixes including many items uncovered by pylint.
Modify retry strategy
Increase number of retry attempts and increase timeout on request and
interested messages