Fix RPL construction: allow short-term to be marked as long-term (regression after !1868) See merge request !1878