Fixes for pending issues on chef11 / chefspec3