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