merge deployment role into populate node role into
Fix bug in state `case` switcher

Multiple matches in `when` clauses need to be delimited with commas, not `||`.
Merge pull request #655 from aspiers/master

Fix bug in state `case` switcher
working towards delayed job
Merge branch 'master' of https://github.com/crowbar/barclamp-crowbar