reorder for RFC6350

Signed-off-by: Lehner Florian <dev@der-flo.net>
use cardinalities according to RFC6350

Signed-off-by: Lehner Florian <dev@der-flo.net>