Fix #3954 -d works as expected now
Check for 'order_masters' before skipping command/jid on no minions
Minor performance optimization

__opts__ doesn't exist here, so and exception was ALWAYS being thrown by
that line, so the jid was always ''.  Turns out this is expected
behavior at this point, and fixing it would introduce bugs.  Thus, we
skip the Exception step and just set jid = ''
Normalize multiline function declarations (for PEP8)
More PEP8 fixes (normalize multiline function calls)
Check for 'order_masters' in master.py as well
Remove legacy eval and replace with safe yaml interp Fix #3940