Fixed some typos in variable names, POD and error messages.
Fixed: Merging a watched ticket _into_ another should "transfer" the Watch status to the final ticket (thanks to Michiel Beien!) (bug#5012).
Squashed commit of the following:

commit fe91ef440624b4037106e4f037457c67af3a6f03
Author: Michiel Beijen <michiel.beijen@otrs.com>
Date:   Tue May 20 17:31:07 2014 +0000

    Changes by otrscodepolicy script.

commit 2d510bf81ef9f28c24978304a5a82696dfd03b6c
Author: Michiel Beijen <michiel.beijen@otrs.com>
Date:   Mon Nov 18 20:20:31 2013 +0100

    Transfer watch status when merging tickets.

    This fixes bug#5012 - http://bugs.otrs.org/show_bug.cgi?id=5012

commit 8cae3b6ad16e73e8a703cf14fd93967710be99dd
Author: Michiel Beijen <michiel.beijen@otrs.com>
Date:   Mon Nov 18 17:39:56 2013 +0100

    Moved Watcher tests to separate file.

Conflicts:
	CHANGES.md
	scripts/test/Ticket.t
Merge branch 'typos-msgs' of github.com:mbeijen/otrs-1
Fixed: backup.pl doesn't work with PostgreSQL unix sockets (bug#10430).
Squashed commit of the following:

commit 2dc7f59a560fa595c537f4a3c8eeda1591549549
Author: s7design <otrs@s7designcreative.com>
Date:   Tue May 20 16:41:04 2014 +0200

    Changed backup.pl and restore.pl for PostrgreSQL when it is used unix socket
Merge remote-tracking branch 'upstream/master' into otrs-master