Alex Gonzalez

TODO: check the configuration is correctly set after solving conflicts

@resin-jenkins retest this please

@resin-jenkins retest this please

@resin-jenkins retest this please

Verified the settings on the `raspberrypi4-64` docker image.

@resin-jenkins retest this please

@resin-jenkins retest this please

@resin-jenkins retest this please

lgtm

@resin-jenkins retest this please