Refs #7363. Changing pvnext handling for packaging vars.