CMS-2481 Index-configuration of content

Some cleanup and improvements
CMS-2752 Create ContentQuery
CMS-2765 Create ContentQueryJson serialization