Merge pull request #418 from xschildw/java-client-migration-support

Java client migration support
Merge pull request #423 from dburdick/plfm-1869

PLFM-1869 - keep activities from being inherited across versions for Fil...
:)
Fixes for PLFM-1888, PLFM-1891, PLFM-1892
Merge pull request #426 from john-hill/PLFM-1891

Plfm 1891