Merge "Improve paths validation and creation in certServiceClient, improve coverage"