Fix Issue #333

Summary: The variables are one thing that should be extensible but
due to use of || the specified variables in the agent recipe
always overrode any new varaibles added via attributes. This fixes
the problem by merging all defined attributes in order of
inheritence.