Merge "Upgrade to Sodium SR4"

diff --cc odlparent/binding-parent/pom.xml
Simple merge

diff --cc odlparent/bundle-parent/pom.xml
Simple merge

diff --cc odlparent/feature-repo-parent/pom.xml
Simple merge

diff --cc odlparent/karaf4-parent/pom.xml
Simple merge

diff --cc odlparent/mdsal-it-parent/pom.xml
Simple merge

diff --cc odlparent/odlparent-lite/pom.xml
Simple merge

diff --cc odlparent/odlparent/pom.xml
Simple merge

diff --cc odlparent/single-feature-parent/pom.xml
Simple merge