Merge "Revert "Revert "kolla: Increase resources for nordix-vpod"""