CLEREZZA-940: Commented out test that fails compiling
CLEREZZA-940: Uncommented and fixed failing test

File wasn't compiling due to a name change in platform.config module.
CLEREZZA-941: using released version of felix.main and security
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/clerezza