Include flavor ID override for service requests

If a service request includes a flavor override it needs to be passed to
the template *_for_request calculation methods.

content/automate/ManageIQ/System/CommonMethods/QuotaMethods.class/__methods__/requested.rb

@@ -287,14 +287,14 @@ def cloud_volume_storage(args_hash)
 
 def cloud_number_of_cpus(args_hash)
   default_option(
-    args_hash[:resource].source.number_of_cpus_for_request(args_hash[:resource]),
+    args_hash[:resource].source.number_of_cpus_for_request(args_hash[:resource], @flavor_id),
     args_hash[:options_array]
   )
 end
 
 def cloud_vm_memory(args_hash)
   default_option(
-    args_hash[:resource].source.memory_for_request(args_hash[:resource]),
+    args_hash[:resource].source.memory_for_request(args_hash[:resource], @flavor_id),
     args_hash[:options_array]
   )
 end