RSKIP-264: Simplified Emergency Time-locks Refresh

Discussions for RSKIP-264, proposed by @SergioDemianLerner

Note that this is related to the prior RSKIP-207