Updated git submodules

Updated git submodules

Project: odlparent master 9dc34524911970231ba84a03261df2c43a7916da

Remove '4' suffix in applicable artifact names

During the Karaf 4 migration, while both Karaf versions coexisted it
was necessary to have a different artifactId for Karaf 4 features and
feature repositories produced by odlparent. After Karaf 3 is removed,
this is no longer necessary, and this patch removes the '4' from
applicable directory, artifact and property names.

Change-Id: Ib6446a86a75a1a4b9637e73b71aca640a22807f4
Signed-off-by: Lorand Jakab <lojakab@cisco.com>