Merge "bugfix: Harmonize test/trial RFC2544 terminology"