Commit merge changes in JAX-RS branch.

Change-Id: Ibc370b507263c29db4195b506294347c0501cd2f
Signed-off-by: Neevo Lima <peter.merkert@gmx.de>