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

...eEntity and Locationable