Fixed JSF conflict issue with liblocation
Re-align with local