p4 support: Cleanup and Merge the p4 ancestry suppression flag to 2.6/7/default

Our product teams collect and evaluate feedback from a number of different sources. To learn more about how we use customer feedback in the planning process, check out our new feature policy.