Fixed compile failures due to changes in portal master branch. Also added deprecation javadoc instead of using @SuppressWarnings