qa/new: tweak script so _cleanup() provided and used in trap
qa/new: tweak script so _cleanup() provided and used in trap

adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp