Added ephemeral disk limitationx

backport: havana

Fixes bug #1247207

Change-Id: I6aa119148ccd783dd80cd6dcee6322b952c0a60d
(cherry picked from commit 00d59544abb4837e316dd6ade1d1dd181f1818e6)
Merge "Added ephemeral disk limitationx" into stable/havana