Delete whitespaces and fix rebase

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
Merge branch 'feat_updsqlstdlib'

Conflicts:
	deployment/puppet/mysql/lib/puppet/provider/database/mysql.rb

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