Allow filtering by term type in getTermsOfEntities

Change-Id: Ie0d92ae917fe6a9ebe112a3a37466c94250334db
Merge "Allow filtering by term type in getTermsOfEntities"