Add method to add missing @XmlRootElement annotations.
Merge remote-tracking branch 'github/dev' into dev