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.
wouldn't you only need to filter by `environment_id` if that was present? because `environment_id` is unique inside the whole application, right?