Update Nova to 2.2.1

Change-Id: Ic0ffd8a9abed7956f8a94c2e3e543d61ea343fa4