#412 cleanup hard coded configuration
checkin missing deletion
#413 cleanup hard coded configuration
Merge branch 'feature-2014715-sdk-refactor' into feature-20140603-new-sampleapp