master-qa-4505

http://issues.liferay.com/browse/LIFERAYQA-4505