Merge "Updating fix for bug 3989 based on discussion in OVSDB meeting"