merging some bug fixes (and the ebays sensor data upload code) from prod to master