Fixed agent fogbugz settings availability, check for valid branchname before executing UpmergeTask
Update message to post when failing merge, some cleanup