Merge "Cleanup and javadocs for SDN-IP code"