FL-427: update bond template
FL-66: update tap and bridge templates