BUG-576: Fixed situation when xmlClass property was not serialized.

Change-Id: I8a226441bc1370bcf3e7e87b15caec1f17c06e5f
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
(cherry picked from commit 9493158709cd004ef2e20dcdbfd96ab8f6e95e53)
Merge "BUG-576: Fixed situation when xmlClass property was not serialized." into stable/hydrogen