Not able to GET/DELETE L2 Gateway Connection created without optional PORT

Not able to GET/DELETE L2 Gateway Connection created without optional PORT because of code in line number# 79 below from fromMd() method of NeutronL2gatewayConnectionInterface.java file

58 @Override
59 protected NeutronL2gatewayConnection fromMd(L2gatewayConnection l2gatewayConnection){
…….
…….
76 if (l2gatewayConnection.getSegmentId() != null)

{ 77 result.setSegmentID(Integer.valueOf(l2gatewayConnection.getSegmentId())); 78 }

79 if (l2gatewayConnection.getPortId().getValue() != null)

{ 80 result.setPortID(String.valueOf(l2gatewayConnection.getPortId().getValue())); 81 }

82 return result;
83 }

Fix has to be given in both master and stable/beryllium releases.