make sure to create the rsync lock dir for swift
Merge branch 'feature/folsom/betty/master' of github.com:MirantisDellCrowbar/barclamp-swift into feature/folsom/betty/master
Revert "make sure to create the rsync lock dir for swift"

This reverts commit b000f5823b50c64e7241c145f04bccabaabae042.
Fix dispersion
Fix smoketests
Merge branch 'feature/folsom/betty/master' of github.com:MirantisDellCrowbar/barclamp-swift into feature/folsom/betty/master