master-bc-635

http://issues.liferay.com/browse/LIFERAYQA-4495

This is the last pull request for old automation framework.