XCOMMONS-674: Occasional rendering problem when viewing FlamingoThemes.FlamingoDefaultTheme
XCOMMONS-673: DefaultVelocityEngine is doing a lot of locking