Fixes #6147 - filter both org and env in sys

systems index action does not filter by environment_id when both
organization_id and environment_id are passed; it only filters by
organization_id. This allows the index action to filter by both.