Merge "Allow installation of cert with .der extension" into sc-dev