fixes client socket timeout issue #1435
Merge pull request #1609 from gurbuzali/client-socket-timeout-issue-1435/3.x

fixes client socket timeout issue #1435
Exception message returned as the result if there are any exception
Merge pull request #1663 from eminn/ScriptingErrorResponse-3.x

[backport] Script Execution will return exception message