Required some clean-up of getImplementationId vs. getUnoTunnelImplementationId
confusion.

Change-Id: I645dd80d24efe7ed5224b220911eed8ad880b7c0