Merge pull request #5 from aabes/feature/folsom/master

for packaged based cinder, don't depend on git barclamp
Getting rid of PFS bits
Merge pull request #6 from MirantisDellCrowbar/feature/cinder-pkg/betty/master

Getting rid of PFS bits in packaged Cinder