Update require_package() from Vagrant

Pull in b2f21342967eb768538a9e56bf96c71a63c690a1 from MWV.

Change-Id: Ic193304d47ce23d85d1fde69b6707ffd91983946
Merge "Update require_package() from Vagrant" into production