Stack-21 - Etags for credentials

Cherry picked