Upgrade to 6.8 and rewrite allinone resolver.
Merge branch 'master' of github.com:OData/Samples