Merge "Fix errors in placeVnf and add test cases"