Merge "move nova v3 delete image tests into glance testing"