added role check for single-controller
udpated role lookup
Merge pull request #194 from rackerjoe/v4.2.2rc

Merged automatically by jenkins after successful build test