Trunk tracking updates to sync to PSOl r3677.

Includes minor additions to test only. (One extra IPRO-related-test and changes required for that test will be added to a separate pull request.)