Merge "Increase number of hugepages allocated for nova" into stable/colorado