Merge "fixing LISP flow mapping addr format table" into stable/beryllium