HTMLFORMENTRY-45(2.3)

made changes to encounter location so that it allows system default as
default encounter location