Merge "Fix reference issues (VNFSDK, Models, DMaaP)" into beijing