Merge pull request #12873 from gtmanfred/develop

Some final cleanup of the nova driver