Merge "Update 5G-bulkpm CSIT for pm-mapper with Java 11"