Trivial rebasement, fixed some broken tests, and inserted some TODOs: Rostislav M. Georgiev <rostislavg@vmware.com>