MDL-46191 gradereport_history: Final clean up for integration