Event Count not accurately counting active/held states

Sorry if this is a duplicate of others, since there's a few issues that might apply here.

I'm not sure if this is an issue or the intended design, but some review would be good on a specific section of `registration.module` and the function `registration_event_count()`.

Right now, the code runs as follows:

<?php
    $active_held_states = registration_states(array('held' => TRUE, 'active' => TRUE));
    if (!empty($active_held_states)) {
      $query->condition('state', $active_held_states, 'IN');
    }
?>

But where I'm getting lost on it is that this is grabbing registration states that are BOTH held and active, since `registration_states()` will accept condition parameters and add them separately as property conditions (i.e. AND select statements in SQL not OR). According to the validation patch in the DEV version on line 965 in `includes/registration.forms.inc` states can only be held OR active, so this check should never run, in theory.

Without that form validation, when a state is set to both held and active the system will return a fatal error, because registration objects are passed to the query condition, rather than arrays, which is described in Issue 2469985.

So I think it should be as follows:

<?php
    $active_held_states = array_merge(registration_get_active_states(), registration_get_held_states());
    if (!empty($active_held_states)) {
      $query->condition('state', $active_held_states, 'IN');
    }
?>

This appears to work on our testing site, but it would be good to get some feedback since ours is a limited use case.