PIM-1430 : update changelog
PIM-1430 : clean up services definitions
PIM-1430 : fix unit tests