Merge "Use checksum to determine if config has been modified" into oc-mr1-dev am: 94e0d039d4
am: 60999dbe1c

Change-Id: I63d9964e5a6115911701d54058f2a89239703e81