Code improvement: avoid reduntant if conditions
Code improvement: avoid reduntant if conditions

while adopting stack, the presence of adopt-data
is being checked twice, which can be done with
only once.

Change-Id: I90ef2df729879df50637ee5c1621f9756fed62fd

miguelgrinberg/heat,maestro-hybrid-cloud/heat,jasondunsmore/heat,jasondunsmore/heat,dragorosson/heat,takeshineshiro/heat,maestro-hybrid-cloud/heat,rh-s/heat,dragorosson/heat,miguelgrinberg/heat,gonzolino/heat,steveb/heat,pshchelo/heat,dims/heat,gonzolino/heat,rh-s/heat,steveb/heat,pratikmallya/heat,pshchelo/heat,cryptickp/heat,cwolferh/heat-scratch,noironetworks/heat,openstack/heat,noironetworks/heat,cwolferh/heat-scratch,rdo-management/heat,dims/heat,cryptickp/heat,rdo-management/heat,pratikmallya/heat,srznew/heat,openstack/heat,srznew/heat,takeshineshiro/heat