Keeping up with nova interface changes

Change-Id: I76d51bf64496a4c63593f4b22ae32b5e95eebaf7
Merge "Keeping up with nova interface changes"