Fix for property values that contain '='

Change-Id: I879e2b12f51ef07724c6b22a28ce42a01c049891