master-bc-672


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