Remove deprecated roles, and lint remaining labsproxy.pp

Change-Id: Id2a3bcdd75050c4e5a74302b27e17bb4cec5fe5b
Merge "Remove deprecated roles, and lint remaining labsproxy.pp" into production