Merge "Fix testing for the write-devstack-local-conf role"