fix(bookshef): WIP: attempt upgrading bookshelf to newer Rails#1614

glasnt wants to merge 6 commits intomainGoogleCloudPlatform/ruby-docs-samples:mainfrom

bookshelf-upgradeGoogleCloudPlatform/ruby-docs-samples:bookshelf-upgradeCopy head branch name to clipboard