Fix some bugs with the indentation patch.

i18n fields were having 'field' appended to them still (probably
a rebase issue). Also check for "indentation" property in the
JSON block instead of assuming it exists.

Change-Id: I4b250ac4d6e419b0c7e274536ddc704817900f86