Merge "Add support for jks cert fomat"