Merge "MaaS: commissioning/deployment retry"