Merge "remove sticky ip address." into stable/brahmaputra