BZ-996490 - Rules not listed in Test Scenario - New expectation dialogue

(cherry picked from commit 531b92af86d5304834ef686ec53ad10a46d8e646)
BZ-1006481 - UI support for 'extends' rule keyword broken

(cherry picked from commit f917049562aefb74be79ba1daf60e1d46ff0d1a6)