KCINFR-979: minor cleanup of xmlbeans step