Update Maven support to build with SDK 22.0

Also converted tabs to spaces in a separate commit