restxml empty string fixes

Created originally on Bitbucket by cmcdaniel (Craig McDaniel)

Was already merged in Bitbucket before import, marked as merged by the import user

Do not convert None and empty restxml strings to 'None'.