Uncommented remedy_role:master specific states and added relevant match instruction for matching grain