Change I12859167d19b9f40e3378ac08fed094a42f40bc7
put the evaluation of cinder_scheduler_default_filters inside an
{% if } block that it wasn't meant to be inside. As a consequence,
that setting would be ignored more often that it would be
honored.
The Queens version of this patch must retain the "## Cinder API's
enabled" section that the patch in master removes, since Queens does
still support the cinder_enable_v{1,2,3}_api options.
Change-Id: Ic5707615571e62ba2326e2ad436333bac246c8dd