Fix typo preventing overload conflict error

role2->get_override_method_modifier is being compared to itself for inequality, instead it should be compared to role1->get_override_method_modifier
added tests for the typo fix
Merge branch 'topic/override-in-role-composition' of github.com:moose/moose into topic/override-in-role-composition