[ardrone2] merge remaining ardrone2 support

closes #396