fix edit entity
fix SP SingleLogout info lost from session during registration
Merge branch '1.x-stable' into develop