Merge branch 'release/4.0.4.1' into smm_master
Merge branch 'release/4.0.4.2' into smm_master
bugfix: Unknown storage engine 'FEDERATED'
bugfix: uninitialized constant Chef::Node::Servtag

bugfix: undefined method '[]' for nil:NilClass
Merge branch 'feature/chef11_rebased' into develop