Merge "Modify pom.xml and nemo-impl vnspacemanager test files"