Added ephemeral disk limitationx

backport: havana

Fixes bug #1247207

Change-Id: I6aa119148ccd783dd80cd6dcee6322b952c0a60d
Merge "Added ephemeral disk limitationx"