Merge changes Id970743f,I50643f5d

* changes:
  ondevice-signing: merge createCertificate() into createSelfSignedCertificate()
  ondevice-signing: remove unused cert and signature code