Added some changes to faciliate automated functional testing
Merge branch 'serialized-clientid-fix' of https://github.com/sheldonhall/meda into serialized-clientid-fix
Doing a merge