Updated ebs to deal with Chef-11 convergence/compilation time differences
Merge