Fix XSD validation timeout issues

Signed-off-by: Fred Bricon <fbricon@gmail.com>
Fix failing tests in Kepler

Signed-off-by: Fred Bricon <fbricon@gmail.com>