Bug #414: quote the leftid value to avoid problems with non-alphanumeric characters.
Bug #415: use remote-id for peer ID unconditionally if it's set.
0.12.105+vyos2+lithium5