Heartbleed RSA Keydump - merge fixes

Flattened, merge conflicts resolved, etc.