Issue #2300611 by nickwaring89: Updating Custom Block module in MAINTAINERS.txt.
Issue #2272987 by followup sun: Fixed Do not persist session manager.