SCRUM-1684 - some attributes need definitions irregardless of their inclusion in object templates, other minor fixes to get tests running
Cleaner checking for duplicate rpsl static map values
Merge branch 'upstream-rpslvariant' into apnic