Merge proposals dependent on lp://qastaging/~flickr-uploadr-team/flickr-uploadr/flickrapi-exp

1. flickrapi-exp
2. Dependent merge proposals