Merge branch 'master' of https://github.com/AppScale/appscale into java-composites
Merge branch 'java-composites' of https://github.com/nlake44/appscale into java-composites
fixing unit test