Merge "Bug 4735 - null pointer exception in SouthboundImpl"