ContentServicesComplex.getAssocAndContentAndDataResourceCacheMethod was not using the passed contentId in condition list, and also was not using the ContentAssocDataResourceViewFrom/To view entity to get the result. Thanks to Deepak Dixit for the patch.
Misc minor cleanups (removed commented out code) and some small formatting fixes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1643061 13f79535-47bb-0310-9956-ffa450edef68