Comment 24 for bug 1613246

Finally, the commit has been reverted, it turned out that it was based on false assumptions and didn't fix anything. Now the problem is fixed by using puppet to execute shell tasks which is not prone to this type of problems.