Pull in changes that include ebextensions directory support