Decouple modulecore.ui from servertools
Respond to proposed changes in wtp-common to break dep on servertools