Resolves conflict from PR 321 using JUnit 5#394

garydgregory wants to merge 1 commit intoapache:masterapache/commons-net:masterfrom

garydgregory:pr_321_junit_5garydgregory/commons-net:pr_321_junit_5Copy head branch name to clipboard