Merge "Fix SDNC portal liveness initialDelaySeconds"