Code changes for OpenDaylight Neon