MANATEE-188: Fixing make check after commented out code
Merge branch 'MANATEE-188' of github.com:joyent/manatee into MANATEE-188