merge master into v7.0 for v7.1.0
[osm/NBI.git] / osm_nbi / tests / cirros_vnf / icons /
2018-05-25 tiernofix flake8 tests 02/6202/3