don't throw exception if application.conf defines a value for ws.timeout
Merge pull request #1971 from varju/2.2.x-ws-timeout

2.2.x-specific fix for exception when ws.timeout defined in application.conf