DDF-78: fixed merge of wrong parent version
DDF-99: re-added karaf 2.3.2 upgrade changes after bad merge