MRPM-137 Integration Test rpm-1 fails on Mac OS X
Annotated version that passes all integration tests.
Downgrade to require maven 2.2.1
Added lots of Java Generic Types.
Changed Iterators into for each loops.
Replaced StringBuffers with StringBuilders where appropriate.
Replaced one more for loop with a for each loop.