Merge "Add more junits misc env jaxb"