Merge "Add if-cap-support for If-OTU4-ODU4 ports (7.1)"