[5595] Merged with 6.0 versions of Worklight files