Hibernate friendly constructor for EphemeralDisk - EUCA-7293

EUCA-7293
Merge remote-tracking branch 'origin/dev/sjones/EUCA-7293' into testing