Merged from trunk

diff --cc src/acl/Acl.cc
Simple merge

diff --cc src/acl/Arp.cc
Simple merge

diff --cc src/acl/Arp.h
Simple merge

diff --cc src/acl/Eui64.cc
Simple merge

diff --cc src/acl/Eui64.h
Simple merge

diff --cc src/acl/StringData.cc
Simple merge

diff --cc src/acl/StringData.h
Simple merge

diff --cc src/acl/UserData.cc
Simple merge

diff --cc src/acl/UserData.h
Simple merge

diff --cc src/eui/Eui48.h
Simple merge

diff --cc src/eui/Eui64.h
Simple merge