Fix formatting to unescape shell builtin

Formatting issues are causing shell builtin if to be parsed as an
escaped command instead.

Closes-Bug: #1312748
Merge remote-tracking branch 'origin/icehouse' into bugs/1312748

Conflicts:
	templates/preseed.erb
Merge branch 'bugs/1312748' into icehouse