More indentation updates.
Merge branch 'v1.5.6.1' of https://github.com/opencart/opencart into v1.5.6
Updated more standards. Merged in latest OC 1.5.6.1 branch.