Merge "Fix nova user dependencies"