[FIXED MGWT-372] ServiceDefTarget unnecessarily imported in some cases
[FIXED MGWT-372] ServiceDefTarget unnecessarily imported in some cases; add test cases
Merge pull request #74 from jieryn/master

[FIXED MGWT-372] ServiceDefTarget unnecessarily imported in some cases