Merge branch 'master' into tlv-mic

Conflicts:
	mech_eap/export_sec_context.c
	mech_eap/import_sec_context.c

diff --cc mech_eap/export_sec_context.c
Simple merge

diff --cc mech_eap/gssapiP_eap.h
Simple merge

diff --cc mech_eap/util.h
Simple merge

diff --cc mech_eap/util_attr.cpp
Simple merge