Import webbtest fix
Merge pull request #1550 from yashodha/webtest-fixes

Import webtest fix