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

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

(cherry picked from commit cf086581476950ca1e7ae7ac920cc7d5a7faa899)