Merge "BUG 4718 - null pointer exception in NeutronSubnetChangeListener.java"