Backport from master

CHANGELOG updates, Kibana upgrade, rpm/deb build improvements, etc.