Merge "salt_pki tunning, file name convention"