refs #7161 - picking up some auto-whitespace fixes along the way