Fixes #3614: Modification for the fcoll/two-phase component and io/ompio component

Based on patch, no changeset numbers provided