Comment 3 for bug 1273126

So as discussed here with Clint, the fix merged here turned out to be the wrong one, tl;dr we didn't need the additional mocking, so I'm going to partially revert the patch and add the missing option group import:

https://review.openstack.org/#/c/65576/5/heat/tests/test_engine_service.py