master-qa-5068

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