Remove componetviews and rawcontent plugins from distributtion
Use "_" as property separators to avoid component queries problems
Merge branch 'master' into nexus-cma