Pass on AttrbuteError correctly
Merge branch 'fix_syndic_minion_highstate' into sl_2014.1