Issue #2336631 by Amitaibu | Ambidex: Fixed OG breaks EntityFieldQuery count query.
Issue #2136007 by anrikun, Jody Lynn: Fixed OG Membership Edit and Delete links give a fatal error.