Merge "pjproject_bundled: Various fixes discovered during testing of OSes"