Fix setup_dev.sh due to ansible changes
Merge remote-tracking branch 'upstream/develop' into combine-roles