Get rid of SubDefinitionProvider

@bug W-1055884@

@rev byao@
Merging origin/goliver/master-pending-subdefprovider into master