Testing a change for USD, also makes the change consistent with uPortal entity definitions