1.7.1 changelog port (#3320)

* 1.7.1 changelog port

* vim stop indenting when I don't want you to
1 file changed