* include service in reflection data (fixes #4639) * changes from review * regenerated test data
cd tests && sh generate_code.sh