z1-feshie platform/mountainsensing apps seem to use both i2cmaster and uart1_i2c_master

[heliosfa]

This will give some conflicting/re-definitions of functions.

[pjb304]

They are symlinked together so are the same file