Merge "Improve SampleVNF hugepages setup"