#667 copy definition to instance.plist
#667 code refactor
Merge pull request #679 from google/issue667

Issue667