Update vendor from cm-11.0 branch

Janice structure changed and janicep support