Merge "Fix exception when registration has no additionProperties"