Fixing issue with escaping a recipe

closes rcbops/chef-cookbooks#505
Merge pull request #325 from galstrom21/grizzly

Merged automatically by jenkins after successful build test
Merge pull request #326 from andymcc/vlan_fix

Adjust nova to account for VLAN change to nova-networks cookbook
Revert "Adjust nova to account for VLAN change to nova-networks cookbook"

This reverts commit 456aa59f5efb3c6c158eac416704f7ea61e7d1f5.