Changes required for keystone support that require dependency updates beyond what we can currently do.

Changes required for keystone support that require dependency updates beyond what we can currently do. #6297