final cleanup for PEM serialization
add both types of EC key formats to parametrized test
Merge pull request #1570 from reaperhulk/final-consolidation

final cleanup for PEM serialization