Merge "Chang deprecated option name from scheduler_available_filters to available_filters for Queens release"