Workaround broken SQL sort by logic
Merge branch 'develop' of github.com:openxpki/openxpki into develop