Merge commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50' into eclair-mr2 * commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50': Fix for 2202408: Replace Never Timeout with 30 minutes
Merge commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50' into eclair-mr2 * commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50': Fix for 2202408: Replace Never Timeout with 30 minutes