Merge "Allow neutron_options customization for dashboard"