Vinod, Mewan |#2339| Moving default state to a property file and using it to resolve missing state in location/flw requests
Merge with 'enhancements'