master-qa-5017

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