and USE_PERL5 in some places Noticed by: bento
PR: 27808 Submitted by: Mark Pulford <mark@kyne.com.au> Reviewed by: will