Update to 20170401
Approved by: lme (mentor) Differential Revision: https://reviews.freebsd.org/D10260