Berkshelf fixes for Travis