Merge pull request #16 from MirantisDellCrowbar/feature/folsom/master

Squashed fixes for Folsom support
Merge pull request #2 from crowbar/feature/folsom/master

Merge pull request #16 from MirantisDellCrowbar/feature/folsom/master