Addressed comments on pull (thanks nlake44!).
Merge pull request #1523 from obino/wheezy

Wheezy
Fixed unit tests from new data layout
Merge branch 'master' of https://github.com/AppScale/appscale into composite-lists
Merge branch 'composite-lists' of https://github.com/AppScale/appscale into composite-lists