Fix error introduced by 4c8ac733, refs #973

4c8ac733 checked for nil values before cloning the variables, but the call
to clone was duplicated right after it, and could cause errors.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/shibboleth_controller.rb