need_configure should return true when master_config is defined as well.

This fixes #2204 and fixes saltstack/salty-vagrant#100
core: Report the proper invalid state when waiting for the guest machine to be ready
Merge pull request #2205 from jcockhren/fix_2204

provisioners/salt: need_configure should return true when master_config is defined as well.