Merge "Refactored support for flavor and image hugepages based on Morgan's suggestins"