adding updated files, mostly $ changes
spaces to fool merge
migrated new uncommitted changes in progress.  Only -Xlint warnings remain