fix issue with merge tickets and disable do merge unless action is chosen
[gitlive] / ChangeLog
2017-08-11 Alan KnowlesMOVED Changelog to ChangeLog