Changes since I renamed lsp.h to mpls.h