Merge changes Idb112e86,Ia345251f

* changes:
  [COMMON] Use readinessCheck template inside certInitializer
  [COMMON] Fix name generation in readinessCheck template