Conflicts:
	db/libdb.pm.in

Conflict resolved by using libdb.pm.in from master, and moving new
constants committed on the tpm-tmcd branch to the new
EmulabConstants.pm.in file.