Merge "Port openstack gerrit to jjb"