Add provider and location parameters in resource create entities
Fix merging of MachineTemplate