restore recipes-distros and config opendroid
Merge remote-tracking branch 'upstream/master'
Merge upstream/master