XD-957 Update SI Dependency - 4.0.0.BUILD-SNAPSHOT

Mainly just import changes and a method name change on
the ChannelResolver.