Merge pull request #134 from danmcp/master

Removing console and broker from geard testing
Merge pull request #135 from danmcp/master

Cleaning up geard vs openshift 3 naming