[scm-migration-dev] Please review #489

[Nathan Bush]

Hi,

Please review:

489 webrev with new files in teamware generates errors
http://cr.opensolaris.org/~nbush/scm-migration/489/webrev/

Thanks,

--Nathan