Merge "Revert "Update plugin to use cas@1.1 hal""