master-bc-470

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