Made OperationTimeout and MaximumMessageSize Configurable

#2704
Made changes as per code review feedback

#2704
Merge branch 'release' into dev