Removing references to s3

We were not using them anyways and they cause problems with puppet 3

Change-Id: Ibaa5b085e2b0d23a7278f6740bf65b92bac16ea6
Merge "Removing references to s3" into folsom