Merge 2.2.1 release branch into the 2(.2).x branch#948

arjantijms merged 2 commits into2.xeclipse-ee4j/tyrus:2.xfrom

2.2.1-BRANCHeclipse-ee4j/tyrus:2.2.1-BRANCHCopy head branch name to clipboard