Merge branch 'fixes_hasyslog'

Conflicts:
	deployment/puppet/swift/templates/proxy-server.conf.erb

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
test debug compact

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>