Merge "Bug:3026 - Echo response timeout needs be exported to configuration"