Remove DATA_TIMEOUT_LOGOUT and expireDataLogout() from SimpleSAML_Session. Now, if we want to store data in the session that needs to go away when logging out, we should do that manually on every logout.