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

Squashed fixes for Folsom support