Review 16557

adrian_waters
Change commented out entry P4PORT->P4_PORT so if uncomment the block of env settings if want auto-generated port numbers it doesn't fail unbound test (later code now used P4_PORT)
Tip: Use n and p to cycle through the changes.