Merge pull request #4252 from tivnet/master

Inconsistent return types: mostly TODOs, some fixes
Removed a stray var dump and added braces
Code changes for #4252
Deprecated versions of void functions shouldn't return
Thumbnail upload buttons shouldn't be submit type. Closes #4263