Revision 1643061

OFBIZ-5896 This commits fixes a regression I introduced with rev. 1635232 (this actually reverts that commit) and provides a different and better fix for the error affecting the "Did you know?" screenlet.
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.