Merge remote branch 'origin/release-1.0.X' into develop
Conflicts:
commons/build_tools/pom.xml
commons/code-parent/pom.xml
commons/parent/pom.xml
commons/unittest_tools/pom.xml
distribution/pom.xml
mappingservice/api/pom.xml
mappingservice/config/pom.xml
mappingservice/implementation/pom.xml
mappingservice/integrationtest/pom.xml
mappingservice/northbound/pom.xml
mappingservice/pom.xml
mappingservice/southbound/pom.xml
mappingservice/yangmodel/pom.xml
pom.xml
Change-Id: Ib337f52ac76acfd7eb85c8f667b192c64c177fb2
Signed-off-by: David Goldberg <david.goldberg@contextream.com>
12 files changed: