RT:2640 fixing missed quoting in case statement

Change-Id: Ib1841697e5a58cd7b051d5c7f8092e593aef9ef4
fix missing quotes in realm case, do not quote booleans

Change-Id: I8d3e0d27146628f690e30d7edfcdaf0e18e06cc9
Merge "RT:2640 fixing missed quoting in case statement" into production
Merge "fix missing quotes in realm case, do not quote booleans" into production