Two fixes to rolematcher.py

Change-Id: I13b481707feafac3bd09188ae80a07ff6bc8b8a8