Follow CATS code conventions
Follow CATS code conventions

[#113221077,#113226335]

Signed-off-by: Iryna Shustava <2d2404266b0a0832518fb8eeb9ad53e987c2cdbe@pivotal.io>

matt-royal/cf-acceptance-tests,matt-royal/cf-acceptance-tests,matt-royal/cf-acceptance-tests,matt-royal/cf-acceptance-tests,matt-royal/cf-acceptance-tests,matt-royal/cf-acceptance-tests,matt-royal/cf-acceptance-tests,matt-royal/cf-acceptance-tests