Consistent timeout error message
Merge pull request #1288 from atsareg/fix-v6r7

Consistent timeout error message