Fixes in reading "properties" from groovy config and in NshTest