master-bc-517

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