Decrease I2C timeout in config so it matches the previous 500 us timeout as close as possible. This is necessary after fixing the NuttX I2C timeout logic
Merge branch 'master' of github.com:PX4/Firmware into i2c_timeout
Merge pull request #1320 from PX4/i2c_timeout

Decrease I2C timeout in config so it matches the previous 500 us timeout...
Merge remote-tracking branch 'upstream/master'