Merge branch 'v4.2.2rc' of github.com:claco/nova-network into havana

Non fast forward merge caused by a direct commit to havana just after
4.2.1: f1c81e4

Conflicts:
	attributes/default.rb