Update the custom_completion classes to accept the new completion criteria
This implements sort ordering for all completion conditions, in activities which support custom completion conditions.