Port of 2246-uuid-is-nil-for-new-installation to EE

Merged Douglas Barbosa Alexandre requested to merge ee-2246-uuid-is-nil-for-new-installation into master