[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11835: Added missing ehcache entries and removed certain hibernate association caches