Cleaned up some Eclipse warnings.
More Eclipse warning cleanup.
rework smoke tests to be java7-compatible, also smarter dealing with provisioning
Merge remote-tracking branch 'origin/master' into pjsm/2.0