change bldr/simple_service references to chef/simple_service

[reset]

Don't merge just yet. There is still something wrong with the functional test suite being unable to locate the chef/simple_service docker image.

[chef-delivery]

This PR has passed 'Verify' and is ready for review and approval!
Use: '@delivery approve' when code review is complete.

[fnichol]

Think I've got this: I added an explicit pkg_derivation=test in the simple_service plan. I'll crunch and re-push to this branch for another round of testing.

[chef-delivery]

This PR has passed 'Verify' and is ready for review and approval!
Use: '@delivery approve' when code review is complete.

[fnichol]

The above commit doesn't fix 100% of the failures, but we have a solid lead on why:

When a service writes to its key space in discovery, it's writing under bldr and not to the derivative of the package. In the failing functionals, we see a bldr and a test key at the root of etcd.

Given the above, we're closer to passing functionals and we should be okay to merge this.

[fnichol]

@delivery approve

[chef-delivery]

Change: 49b37dad-0372-40f9-ad34-3df8c460e1b6 approved by: @fnichol