Update diet files resolving several issues for 3.1
Fix target bootstrap version (to 3.1.1)