fix issue gustavo found with enbv vars not overriding x props.
fix issue gustavo found with enbv vars not overriding x props.



SVN revision: 75451

tasn/elementary,rvandegrift/elementary,FlorentRevest/Elementary,FlorentRevest/Elementary,tasn/elementary,rvandegrift/elementary,tasn/elementary,tasn/elementary,FlorentRevest/Elementary,rvandegrift/elementary,rvandegrift/elementary,tasn/elementary,FlorentRevest/Elementary