Removed commented-out lines of code. Reenabling log statements to the app server log.
Merge origin/master