core: merge xdata/xcddefault back into common/comments

refs #4815
make tests work again

refs #4815
fix wrong increment in ids.

refs #4815