PLFM-1869 - keep activities from being inherited across versions for FileEntity and Locationable
Merge pull request #423 from dburdick/plfm-1869

PLFM-1869 - keep activities from being inherited across versions for Fil...