Updates sol006 branch with master

Change-Id: I0fc5d6f0dcf1b0827430602847f0f9e627a599e2
Signed-off-by: garciaale <agarcia@whitestack.com>

diff --cc Makefile
index ab9550a,190a9b1..c158738
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -113,12 -100,7 +112,12 @@@ deps
        $(Q)sudo -H python3 -m pip install -U pyang pyangbind stdeb
        $(Q)sudo -H python2 -m pip install -U pyang pyangbind stdeb
        $(Q)mkdir -p ~/.m2
-       $(Q)cp -n ~/.m2/settings.xml{,.orig} ; wget -q -O - https://raw.githubusercontent.com/opendaylight/odlparent/master/settings.xml > ~/.m2/settings.xml
+       $(Q)cp -n ~/.m2/settings.xml ~/.m2/settings.xml.orig ; wget -q -O - https://raw.githubusercontent.com/opendaylight/odlparent/master/settings.xml > ~/.m2/settings.xml
  
 +sol006_deps:
 +      $(Q)git clone --single-branch --branch v2.6.1 https://forge.etsi.org/rep/nfv/SOL006.git sol006_model
 +      $(Q)patch -p2 < patch/deref_warnings.patch
 +      $(Q)patch -p2 < patch/nested_workaround.patch
 +
  clean:
 -      $(Q)rm -rf dist osm_im.egg-info deb deb_dist *.gz osm-imdocs* yang2swagger $(TREES_DIR)
 +      $(Q)rm -rf dist sol006_model osm_im.egg-info deb deb_dist *.gz osm-imdocs* yang2swagger $(TREES_DIR)

diff --cc tox.ini
index 5f3bc3a,ed1ef21..2a96a59
--- 1/tox.ini
--- 2/tox.ini
+++ b/tox.ini
@@@ -1,18 -1,21 +1,18 @@@
 -# Copyright 2019 ETSI OSM
 +# Licensed under the Apache License, Version 2.0 (the "License");
 +# you may not use this file except in compliance with the License.
 +# You may obtain a copy of the License at
  #
 -# All Rights Reserved.
 -#
 -#    Licensed under the Apache License, Version 2.0 (the "License"); you may
 -#    not use this file except in compliance with the License. You may obtain
 -#    a copy of the License at
 -#
 -#         http://www.apache.org/licenses/LICENSE-2.0
 -#
 -#    Unless required by applicable law or agreed to in writing, software
 -#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 -#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 -#    License for the specific language governing permissions and limitations
 -#    under the License.
 +#    http://www.apache.org/licenses/LICENSE-2.0
  #
 +# Unless required by applicable law or agreed to in writing, software
 +# distributed under the License is distributed on an "AS IS" BASIS,
 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
 +# implied.
 +# See the License for the specific language governing permissions and
 +# limitations under the License.
 +
  [tox]
- envlist = py27,py3
+ envlist = py3
  toxworkdir={homedir}/.tox
  
  [testenv]