Merge "Remove all DIB env vars in jjb"