Upgrade berkshelf and chef versions and fix chef 11 deps issue in test cookbook