561: Fixed TCIP API to be buildable via java 6 and 7