Change Broadleaf version to latest GA, fix breaking change as a result