Fix problem with parsing blueprint things that sometime result in JAXBElements instead of the actual type
Recording .gitmergeinfo Changes