Merge "services: Dont statically include classes in bootclasspath" into main