Fixed webui cleanup issues

Change-Id: I0f0200434bdc4d378a3dd492a41e6c4ccceb0184
Merge "Fixed webui cleanup issues" into R1.06