Merge "Add MaintenanceController JUnits"