scaffold cosmetic fixups
scaffold cosmetic fixups

Signed-off-by: Olivier Mehani <9858fe98d2c7f5f35e0d2a08f134cfc58afd42d3@nicta.com.au>

mytestbed/oml,mytestbed/oml,mytestbed/oml,mytestbed/oml,mytestbed/oml