Use version 22 for external dependencies
Merge pull request #9178 from ricardoquesada/use_version_22

Use version 22 for external dependencies