merge https://review.openstack.org/#/c/123437/3/

cc27e853 Merger: ensure_cloned() now looks for '.git'
merge https://review.openstack.org/#/c/128921/4/

3bfe4dff Update merge status after merge:merge is submitted