bastion: lint

Change-Id: I9f1a78d5fc5fc54ef3d84d88ed387e2f4587d776
Merge "bastion: lint" into production