am 2654f5aa: (-s ours) DO NOT MERGE Removing unused recovey options. Please...
am 2654f5aa: (-s ours) DO NOT MERGE Removing unused recovey options. Please refer to Bug#2502219 for more info.
Merge commit '2654f5aa' into kraken
* commit '2654f5aa':
DO NOT MERGE