PLFM-1869 - keep activities from being inherited across versions for FileEntity and Locationable
Merged develop into plfm-1869 branch
Merge pull request #406 from dburdick/plfm-1869

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