Refactored single machine location spec to include location flags
Expanded SingleMachineLocationResolver to allow flags to be passed in via loation spec