SOFTHSM-104: Inconsistencies between v1 and v2
Merge pull request #16 from bellgrim/SOFTHSM-104

SOFTHSM-104: Inconsistencies between v1 and v2