Revert "[master] preliminary attempt to synchronize master with rt_paparazzi"

This reverts commit 70d1a7a3ee04af733ad5cda90394e6879c1cab90.