This includes merge of RELENG-e2k-edu private branch current state
along with the move to shared multiseat support on e2k and assorted
updates following pkg.in/.