File usage uses entity type, not bundle
Merge branch '7.x-1.x' of https://github.com/vih/vih_short_course_sport into 7.x-1.x