Add zipPartitions to Java API.
Fix flaky test by changing catch and adding sleep
Merge pull request #587 from rxin/blockmanager

A set of shuffle map output related changes
Merge pull request #594 from shivaram/master

Add zip partitions to Java API
Merge branch 'unpersist-test' of github.com:shivaram/spark into blockmanager
Fixed flaky unpersist test in DistributedSuite.