U4-4680 - ensured base type properties always display before inherited type ones when both on the same tab.

This PR contains a small amend to ensure that if you have properties on a tab from a base and inherited type, the base type ones come first.  From memory this was previously the case, but I've found an example in 7.1.1 where this was reversed.  This amend just ensures the order they are added follows the document type inheritance order.