Merge in EDELIVERY/smp from bugfix/EDELIVERY-9133-delete-button-is-not-showing-properly-in-edit-truststore-popup-page-for-user to feature/EDELIVERY-9253-ui-property-configuration

* commit '75be2384075f39da4a05cad1091ca27b31744a07':
  Remove blue coat software name from code names.
  Fix truststore UI feature