Application json fix 

this will include PR for [STRATOS-995]  and [STRATOS-994]