Synchronize stoney with development

In order to get the already fixed bug from
6c8cf21ff4cd54265ed7bdba1fb81b56c8679da2 into development as well i have
imported it.
Synchronize development with stoney

To get the development and stoney release in sync i have integrated the
following commits:

* d782e7adf35224ae11019e020817114efd80892b (https://github.com/crowbar/crowbar/pull/2062)
* dd2d23f5b6986f12616890185820a1f3fcb2ac5c (https://github.com/crowbar/crowbar/pull/2063)