Some refactoring, ConflictMan (Own & Grant) not in the core, separation between tests of Apam Core and Apam optionnal managers