Pull request id bundles/9945cd360a8663f448c4e229cf377825801a3f6d merged upstream.
Pull request id singletons/crowbar/barclamp-crowbar/352 merged upstream.
Pull request id singletons/crowbar/crowbar/1676 merged upstream.
Pull request id singletons/crowbar/crowbar/1677 merged upstream.