TEZ-847. Support basic AM recovery. (hitesh)
Addendum to TEZ-804. Remove comments to add test since test has been added. Some new logs added. (bikas)