merge in jb-mr2-release history after reset to jb-mr2-dev
tree: 4b7a8a7c2bd42708fdac43e15c5fdbf36c66efe6
  1. core/
  2. services/