Move check for acceptable markup filter values to get_markup_filter_name()
Change MARKUP_FILTER names since they are displayed in the UI
Fall back to HTML markup when markup configured module is missing

This fixes bug #2380.