Merge pull request #1 from wso2-dev/master

merge with upstream wso2-dev
update coverage instrumentation file and change carbonserverExtension class in automation.xml
Merge pull request #38 from krishanthasamaraweera/master

update coverage instrumentation file and change carbonserverExtension class in automation.xml