Fixed layout entry value not being retained when the form has errors.

Close #1690
Merge branch 'master' of https://github.com/opencart/opencart