[wrt] Clean up for wrt common
Merge pull request #640 from kangxu/kangxu/wrt/wrt-common-webapp/update

[wrt] Clean up for wrt common suite