master-qa-5516

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