master-bc-551

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