[PLINK-130] - Improvements to the File and JPA stores. Small changes to the test suite.
Merge remote-tracking branch 'upstream/merge/PLINK-130' into merge/PLINK-130