Allow nova-core/milestone to rebase nova changes

Change-Id: I80229474cad977206118889308f7a238e31b9287
Merge "Allow nova-core/milestone to rebase nova changes"