doc: add missing ChangeLog entry
ommysql cosmetic: change some historic names
ommysql cosmetic: change some historic names
Merge branch 'master' into master-ruleeng

Conflicts:
	plugins/ommysql/ommysql.c