[3rd-party feeds] Update.
fix settings build
Merge branch '2.2' of https://github.com/oe-alliance/oe-alliance-core into 2.2