GUVNOR-622 on 5.5.x
Merge pull request #78 from nheron/5.5.x_6GUVNOR622

GUVNOR-622 on 5.5.x