Made the retry policy for service bus configurable

#2803
Merge branch 'release' into dev