Update clear_current_user to allow current_user to be called

Should fix https://github.com/discourse/discourse/issues/1560.