fixing issue - WSAS-1860
removing unused variables
updating fix for WSAS-1860 to replace file separators
re-factoring if-else in getAppBases()
resolving conflicts
Merge pull request #43 from Nipuni/WSAS-1860

fixing issue - WSAS-1860