SOS-1578

Removing these properties fixes one issue for 6.2.x, however, it causes problem for 6.1.x

After talking to Ray, we are going to fix the issue in 6.2 with this ticket http://issues.liferay.com/browse/LPS-35061

Please backport to ee-6.1.20. Sorry for the mistake.