Mark ContentDef getMatchingDef() methods @Deprecated and start client transition to Java 8 Stream API.