Bug 445696 - react to change in Tycho 22
[releng] misc formatting, and fixing "style" errors.