Code formatting updates.
Add missing username column.
Fix comment typo.
Integrate NET-27 and NET-29 updates.
Only require X509 on *Collector.do URLs, to allow node setup URLs to
work before the node has a cert.