Merge branch 'release/aws-eb-cli-260'
merge develop back to master
fixing building
fixing build
Merge master to develop