updated Configuration.java and samples with modified method names
Merge branch 'dev-sampleUpdate' of https://github.com/paypal/merchant-sdk-java into dev-sampleUpdate

Conflicts:
	merchantsample/src/main/java/com/sample/ipn/IPNListenerServlet.java
	merchantsample/src/main/java/com/sample/merchant/Configuration.java