Merge "Add optional parameter to set JJB version from PIP"