fix compatibility problem with reclass 1.4.1

Change-Id: I6af9c84dd270dcbdcee21af05fb5b380bd523f23
Related: PROD-21428
20 files changed