Configure novnc, take two

Change-Id: If0e3d1c316136143167a13e938778b71b8866ef3
Merge "Configure novnc, take two" into production