Various cleanups in the nova chapter

* Rebase against master

Change-Id: Idfadda7b68e046b5c3b2db5d7f2b43ad25adea85
Merge "Various cleanups in the nova chapter"