Merge "Bug 7466 - NPE thrown for interface without lport tag"