DDF-464 - Cleanup (converted null/empty check to use Apache Commons StringUtils)