bug #2009: Add recover action to sunstone(cherry picked from commit 078fbdb7d3f0232e806001e142eabf75aa8ca670)