Merge "[CONTRIB] Fix for re-execution error of the ejbca configuration"