Issue #391: Fix flakey Squash partitionEntity
Merge pull request #397 from ambiata/topic/flakey-squash-partition-test

Fix flakey Squash partitionEntity