Merge "Fix nova db dependency"