Merge "Add OvS 2.8.1 support into SA context" into stable/gambia