Adds redirects from trunk to new locations and renames

Change-Id: Ie4bd759e9f35d713e5398b0f70e777771371c125
Closes-bug: 1221778
Update glance autogenerated tables

Change-Id: Ide438e97568314219e941c9085a3fa10516ef732
corrected wrong include so now point to nova, bug 1227986

Change-Id: I01631c4ba5f802e96cc0d17c48b1e47cf9d937cc
Merge "Update glance autogenerated tables"
Merge "corrected wrong include so now point to nova, bug 1227986"
Merge "Adds redirects from trunk to new locations and renames"