Merge remote branch 'origin/release-1.0.X' into mer

Conflicts:
	mappingservice/integrationtest/pom.xml

Change-Id: I62fc34b7c566198dc62ee1d20026ded5e579f303
Signed-off-by: David Goldberg <david.goldberg@contextream.com>

diff --cc commons/code-parent/pom.xml
Simple merge

diff --cc commons/parent/pom.xml
Simple merge

diff --cc commons/unittest_tools/pom.xml
Simple merge

diff --cc mappingservice/api/pom.xml
Simple merge

diff --cc mappingservice/config/pom.xml
Simple merge

diff --cc mappingservice/implementation/pom.xml
Simple merge

diff --cc mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java
Simple merge

diff --cc mappingservice/integrationtest/pom.xml
Simple merge

diff --cc mappingservice/northbound/pom.xml
Simple merge

diff --cc mappingservice/pom.xml
Simple merge

diff --cc mappingservice/southbound/pom.xml
Simple merge