Also use elements from git clone of instack-undercloud