Merge cm-10.1 changes: support version 2 (2048-bit e=65537) keys in recovery