Merge pull request #10461 from rwz/master

Relaxed jbuilder dependency in Gemfile template