LDEV-1109 Fixes some Branching in Branching issues such as bin placement, position and clip attachment. Also improves redrawing of branch connectors when moving start/end connector hubs.
Get the ldapService bean only when ldap provisioning is enabled - so if spring can't find the bean (throws NoSuchBeanDefinitionException for unknown reason), logging in will still work if ldap provisioning is disabled.
LDEV-1408 Fixed tool output condition class to contain a reference to its related branching activity. Fixed conditional tests on the conditions to include a check of the branching activity as a result the interfering occurring in the setup dialogs is fixed.
LDEV-1419: Temporarily adding back msg.import.file.format so that the Export dialog box has the message text. Still needs to be fixed on the I18N website.