Changed bcrypt algorithm to be optional.
Merge branch 'master' of git.otrs.com:otrs/otrs

Conflicts:
	Kernel/System/CustomerUser/DB.pm