beautify FIXUP_MOUNT logical path and variable name

Change-Id: I138b09286570c4f068572a5c82bb9ea01594416b
Signed-off-by: Simonas Leleiva <simonas.leleiva@jollamobile.com>
[mako] add /data mountpoint fixup

Change-Id: I28da79c68e7b84cfca4cceebe7819a8d44b81b59
Signed-off-by: Simonas Leleiva <simonas.leleiva@jollamobile.com>