Always unroll properties
under oneOf
#1268
Merged
Loading
properties
under oneOf
#1268