Merge pull request #1526 from menivaitsi/tck-issue

Lookup of appengine-web.xml at most (and not exactly) in sub-level 1.
Fixed upgrading from 1.14 images.
Merge pull request #1527 from obino/fix-upgrade-with-bootstrap

Fixed upgrading from 1.14 images.
Merge branch 'composite-lists' of https://github.com/AppScale/appscale into composite-lists
Fixed man TCK datastore issues