general house cleaning and repair of web.py imports

Change-Id: Ia8cc89b5220b51bce8ccfe09f7c459d4dac3bf6b
Merge "general house cleaning and repair of web.py imports"