Fixes for unit tests
Merge remote-tracking branch 'upstream/rules_proto' into rules_proto

Conflicts:
	engine/config/tests/src/test/java/org/jboss/windup/addon/config/GraphSearchConditionTest.java