SW-595: Merge task branch back to release branch

LCS/Common/include/Common/LofarLocators.h

@@ -45,11 +45,14 @@ public:
 	#define		CONFIG_SUB_DIR		"etc"
 
 	// Create a ConfigLocator with a default search path.
-	ConfigLocator() : FileLocator()
-		{	setSubdir(CONFIG_SUB_DIR); }
+	ConfigLocator() : FileLocator() {
+		setSubdir(CONFIG_SUB_DIR);
+		addPathAtFront("$HOME/.lofar");
+	}
 	// Create a ConfigLocator with a predefined search path.
-	explicit ConfigLocator (const string&	aPath) : FileLocator(aPath) 
-		{ 	setSubdir(CONFIG_SUB_DIR); }
+	explicit ConfigLocator (const string&	aPath) : FileLocator(aPath) {
+		setSubdir(CONFIG_SUB_DIR);
+	}
 
 private:
 	ConfigLocator(const ConfigLocator&	that);

LCS/Common/src/FileLocator.cc

@@ -242,6 +242,7 @@ string	FileLocator::locate		(const string& aFile)
 				else {				// test subdir
 					fullname += itsSubdir + "/" + aFile;
 				}
+
 				result = stat(fullname.c_str(), &fileStat);
 				if (result == 0) { // found?
 					return (fullname);

MAC/GCF/TM/src/GCF_Scheduler.cc

@@ -114,7 +114,8 @@ void GCFScheduler::init(int argc, char** argv, const string&	logfile)
 	ConfigLocator	aCL;
 	string 			procName(basename(argv[0]));
 	string			logPropFile(procName + ".log_prop");
-	// First try logpropfile <task>.log_prop
+
+    // First try logpropfile <task>.log_prop
 	if (aCL.locate(logPropFile) == "") {
 		// locator could not find it try defaultname
 		logPropFile = "mac.log_prop";