Adding topic-set-link-priority and topic-type-link-priority to config

Adding topic-set-link-priority and topic-type-link-priority to config
build and schema. Also some minor clean up.