JBTIS-371 - re-enable SwitchYard