This  PR is merging already commited code form the pulpv2 branch into the content views branch
and these comments need to be addressed in another pull request..