reorder the add filters in Alarms and Events page
[bamboo] Automated branch merge (from space/13.2:dffd1c2db308392401c85395a75995ea578c8d04)