Merge "Lazily initialize jaxb context in NB application"