Moved the workdirectory to the workspace
Merge branch 'refs/heads/f/rpm'