Merge remote-tracking branch 'origin/upstream' into upstream-rpslvariant
Merge remote-tracking branch 'origin/upstream-rpslvariant' into upstream-rpslvariant
SCRUM-1684 - RPSL cleanup. (removal of unnecessary attributes, comments, tests, etc)
SCRUM-1684 - rpsl object map changes