US335
Merge pull request #109 from jcannava/grizzly

Merged automatically by jenkins after successful build test
Merge pull request #110 from rackerjoe/US335

Merged automatically by jenkins after successful build test
Fixed spacing in front of [ldap] render
Merge pull request #111 from john5223/grizzly

Merged automatically by jenkins after successful build test
Fix foodcritic notifications and violations in keystone

brings compat up to foodcritic 2.1.0
fix the template, but lose the foodcritic battle
Merge pull request #112 from rackerjoe/foodcritic

Merged automatically by jenkins after successful build test
fixing merge conflict