Merge branch '2.2' into master-3.0

# Conflicts:
#	package.json
#	src/app/models/templates/docker-template.ts
#	src/app/services/template-mocks.service.ts
#	yarn.lock

src/app/components/preferences/docker/docker-template-details/docker-template-details.component.html

@@ -66,6 +66,15 @@
               placeholder="Start command"
             />
           </mat-form-field>
+          <mat-form-field class="form-field">
+            <input
+              matInput
+              type="text"
+              [ngModelOptions]="{ standalone: true }"
+              [(ngModel)]="dockerTemplate.mac_address"
+              placeholder="Base MAC"
+            />
+          </mat-form-field>
           <mat-form-field class="form-field">
             <input
               formControlName="adapter"

src/app/models/templates/docker-template.ts

@@ -11,6 +11,7 @@ export class DockerTemplate {
   console_resolution: string;
   console_type: string;
   aux_type: string;
+  mac_address: string;
   custom_adapters: CustomAdapter[];
   default_name_format: string;
   environment: string;

src/app/services/template-mocks.service.ts

@@ -242,6 +242,7 @@ export class TemplateMocksService {
       console_resolution: '1024x768',
       console_type: 'telnet',
       aux_type: 'none',
+      mac_address: '',
       custom_adapters: [],
       default_name_format: '{name}-{0}',
       environment: '',