Ok, trying to require the 10-self.conf file as well

Change-Id: Ie0e905e603805189c68100fa72f380e89184ed75
Merge "Ok, trying to require the 10-self.conf file as well" into production