CLEREZZA-935: re-added typerendering and launchers
CLEREZZA-948: avoid unnecessary merging of a set wit itself
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/clerezza