Imported Upstream version 1.5.4
Imported Upstream version 1.5.5
Merge tag 'upstream/1.5.5'

Upstream version 1.5.5

Conflicts:
	CHANGELOG
	VERDATE
	VERSION
	examples/haproxy.spec
debian/changelog 1:1.5.5-1