Update steps to create CA cert file
Update sample cert files
Use cert type defined by preferences instead of the builtin value, if it is specified
Fix XML error