Changes for #390 and #393 after code review
Merge branch 'master' of https://github.com/braimanm/allure-core

Conflicts:
	allure-testng-adaptor/src/main/java/ru/yandex/qatools/allure/testng/AllureTestListener.java