Allow extra file refs to be defined in opts and saltfile per #9878
one star, and lint!
Merge branch '2014.7' into ex_file_refs

Conflicts:
	salt/client/ssh/wrapper/state.py
Merge pull request #16733 from thatch45/ex_file_refs

Allow extra file refs to be defined in opts and saltfile per #9878