Merge branch 'release/2.1.6' into develop
update rails version
Version bump to 2.1.7
Merge branch 'release/2.1.7'