Fix MRN-729 and MRN-715

Deploy environment forbidden for new empty environment

Change-Id: Id123c99c4f93ab3e1ae10c2dbed0ad29c41503d0
Merge "Fix MRN-729 and MRN-715"