Revision 1348836

Applied fix from trunk r1347442.
Set cache flag for findByAnd method calls in PreferenceServices; improved logic to avoid to run the same query twice when user is not passed.
Note: This is not a bug but not using cache here is really a very serious issue for performance on production server because the queries are executed at every page request. We have applied this changes on production server and then observed the production server activity for about one week and found that now production server is working fine under heavy load.