Merge "registration: Fix ignoring 'merge_strategy' key in manifest_version 2"