2014-06-17 merge from new Jenkins,etc.. openstack-dev:master