Allow image name and service name to be different
Merge pull request #147 from jwforres/allow_diff_svc_name_for_img

Merged by openshift-bot
bump acceptance timeouts
Merge pull request #148 from bparees/bump_devenv_timeout

Merged by openshift-bot