Minor changes
Temporarily add back log statements
Merge branch 'mem-pool' of github.com:andrewor14/incubator-spark into mem-pool