Issue #2722699 by anoopjohn, mfernea, Mile23, martin107: Fix Drupal.Commenting.FunctionComment.InvalidReturnNotVoid (cherry picked from commit 73347e1c)