Add metadata version and increment service version in case of modification

Change-Id: Ib5853938386142edd291e3e005b381c2524c58d5
Merge "Add metadata version and increment service version in case of modification"