Merge pull request #480 from cloudedge/pull-req-master-b42e0dba6ba371f2500d6076e85d7fedfb456ad0

https://github.com/crowbar/barclamp-crowbar/pull/480

Merged by devtool for VictorLowther
skip the scaffolds tests because they are slow