re #9923 mreged master and solve warning

Code/Mantid/Build/CMake/CommonSetup.cmake

Code/Mantid/Build/CMake/FindPylint.cmake

Code/Mantid/Build/CMake/PylintSetup.cmake

Code/Mantid/Build/Jenkins/buildscript

Code/Mantid/Build/Jenkins/buildscript.bat

Code/Mantid/Framework/API/CMakeLists.txt

Code/Mantid/Framework/API/inc/MantidAPI/FrameworkManager.h

Code/Mantid/Framework/API/inc/MantidAPI/IFuncMinimizer.h

...Mantid/Framework/API/inc/MantidAPI/MultipleFileProperty.h

Code/Mantid/Framework/API/inc/MantidAPI/ScriptBuilder.h

Code/Mantid/Framework/API/inc/MantidAPI/WorkspaceProperty.h

Code/Mantid/Framework/API/src/Algorithm.cpp

Code/Mantid/Framework/API/src/AlgorithmFactory.cpp

Code/Mantid/Framework/API/src/FileProperty.cpp

Code/Mantid/Framework/API/src/FrameworkManager.cpp

Code/Mantid/Framework/API/src/IFuncMinimizer.cpp

Code/Mantid/Framework/API/src/IFunction.cpp

Code/Mantid/Framework/API/src/Sample.cpp

Code/Mantid/Framework/API/src/ScriptBuilder.cpp

Code/Mantid/Framework/API/src/WorkspaceGroup.cpp