Inconsistent return types: mostly TODOs, some fixes
Merge pull request #4252 from tivnet/master

Inconsistent return types: mostly TODOs, some fixes