Made two_level_array_t not use key_t.
Merge branch 'sam_fix_osx_build' into next
Merge v1.7.x into next.