master-bc-717

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