Update PRMerge.md
Additional REST API tests, few code cleanups along the way
Merge pull request #158 from smarthi/suneel

Additional REST API tests, few code cleanups along the way
make netty configuration configurable
Additional REST API tests, commented out failing test
Merge pull request #163 from smarthi/suneel

Additional REST API tests, commented out failing test
Merge branch 'master' into nettyConfigurable
Merge pull request #161 from huafengw/nettyConfigurable

make netty configuration configurable